2010/10/4 Lluís Batlle i Rossell <[email protected]> > On Mon, Oct 04, 2010 at 10:55:02PM +0200, Laurens Van Houtven wrote: > I wonder how difficult it will be in fossil to find "the version of the > parent > branch last merged into a child branch". >
Fossil does this automatically for you when you merge a branch back into the trunk. (Or do any merge operation for that matter.) My understanding is that SVN would *not* do this for you automatically and that this was, or maybe still is, a major chore with SVN. But it is all automatic with Fossil. You can branch off of trunk, then merge from trunk to branch or branch to trunk (or both) as often as you like, and Fossil keeps track of everything for you automatically. Have a look at wolfgangFormat2CSS_2 branch in Fossil itself, and see how many times it has merged back and forth between trunk. And yet we've never had a merge conflict on any of these merges, that I am aware of. There is a command "fossil test-find-pivot" which will find the latest common check-in between two branches. The comment is for testing purposes only. But if you really need to know what that "pivot" is, you can use the test command to find it I suppose. Is the above discussion in any way relevant to what you were talking about, or have I completely missed the mark? > > Regards, > Lluís. > _______________________________________________ > fossil-users mailing list > [email protected] > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > -- D. Richard Hipp [email protected]
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
