• Do not register here on develop.twiki.org, login with your twiki.org account.
• Use View topic Item7848 for generic doc work for TWiki-6.1.1. Use View topic Item7851 for doc work on extensions that are not part of a release. More... Close
• Anything you create or change in standard webs (Main, TWiki, Sandbox etc) will be automatically reverted on every SVN update.
Does this site look broken?. Use the LitterTray web for test cases.

Making a separate item for each merge is insane.


Please don't do this.

When you check in, use the Item numbers for the issues that were fixed on TWiki 4 branch.

If necessary we can relax the constraint that requires bug items to be in an open state, for DEVELOP branch.

CC

It is also not very helpful to have simply a revision number as log message - better suggestion is to re-use some of the original commit message(s).

(I don't mind a merge declaration with original rev numbers, but a human readable log message on change committed is first priority).

-- SP

I was just going through the rather large volume of mail, doing a basic single-rev merge of any changes that didn't result in a conflict. The original rev number is sufficient to connect the develop update with the original update and duplicating the log message seemed unnecessarily time consuming. Even doing this much took more time and energy than I have to spare, but I wanted to help out.

It would seem to make more sense for someone to write a script to do the labour, but if that can't be done or for some reason isn't desirable, I'll leave the task to someone who is willing to put in the large amount of manual effort involved.

Obviously CDot and I didn't talk enough about what he meant by merging TWiki 4 changes into develop. Sorry about that, Cdot.

ML

Thanks.

-- SP

ItemTemplate
Summary Catchall for merging in TWiki4 fixes
ReportedBy TWiki:Main.MeredithLesly
Codebase ~develop
SVN Range Tue, 30 May 2006 build 10392
AppliesTo Engine
Component

Priority Normal
CurrentState No Action Required
WaitingFor

Checkins 10472 10473 10474 10475 10476 10477 10478 10479
TargetRelease n/a
Edit | Attach | Watch | Print version | History: r15 < r14 < r13 < r12 < r11 | Backlinks | Raw View | Raw edit | More topic actions
Topic revision: r15 - 2006-06-06 - MeredithLesly
 
This site is powered by the TWiki collaboration platform Powered by PerlCopyright © 2008-2019 by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
Ideas, requests, problems regarding TWiki? Send feedback