On Thu, Mar 03, 2011 at 10:39:11AM -0500, Richard Hipp wrote: > 2011/3/3 Lluís Batlle i Rossell <virik...@gmail.com> > > This could have worked, if the first merge of the end of January did not > > have > > any rename. It had renames, and due to this, the last merge attempt > > complained > > about this like this: > > WARNING - no common ancestor: file1 > > WARNING - no common ancestor: file2 > > WARNING - no common ancestor: file3 > > WARNING - no common ancestor: file4 > > .... > > > > Can you use the --baseline option to "merge" to specify the common ancestor > checkin that you want the merge to use?
It gives exactly the same behaviour as without it, if we set the --baseline to the output of "fossil test-find-pivot A trunk". I always thought the merge used always the 'shortest path', instead of what the description of "--baseline" says about: "... instead of the nearest common ancestor". Thank you, Lluís. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users