On Sun, Nov 12, 2006 at 03:17:19PM +0100, Mathieu Roy wrote: > Le Dimanche 12 Novembre 2006 15:12, Sylvain Beucler a écrit : > > On Sun, Nov 12, 2006 at 02:19:58PM +0100, Mathieu Roy wrote: > > > Please do not commit on the trunk, as asked at > > > https://gna.org/task/index.php?3776#comment2 > > > > > > I will have no time to deal with merge conflict this month with the trunk > > > and the current development branch. > > > > Hi, > > > > In what I have in mind, the trunk gets bugfixes and other minor > > changes that do not fit in a particular branch at any time. > > Sure. Unless someone said he currently does not want to risk merge issues and > ask people to commit on a specific branch :)
We're talking about less than 10 lines of code. I tested, and there's no merge issue with it. There will be more if I put changes that are not specific to my branch in the branch, it's better when they're taken into account earlier. After a few tests, it appears that SVN can deal with this situation pretty well, provided we use the syntax: ~/trunk> svn merge [EMAIL PROTECTED] [EMAIL PROTECTED] ~/branch> svn merge [EMAIL PROTECTED] [EMAIL PROTECTED] (that is, not svn merge -r X:Y ...) > > It is then reasonably easy to merge those with the open branches along > > the way. Too bad that there's no star-merge in SVN, as I just notice, > > though :/ > > > > I have troubles following every notifications from the tracker, > > especially since there was a lot of empty ones recently, so please > > send a sum-up mail to savane-dev for important informations every now > > and then. I check the SVN commit messages though :) > > There were plenty because the other day I was messing with the script that > annotates trackers on SVN commit. But these was tests, not real changes. All > relevant matters are in the ChangeLog.byversion No, I mean that there is too much traffic, and that we received lots of changes like "added dependency X to dependency Y" or "title X -> X+24char". _______________________________________________ Savane-dev mailing list Savane-dev@gna.org https://mail.gna.org/listinfo/savane-dev
