[fossil-users] no common ancestor
If everything is (ultimately) spawned from the initial empty checkin, how can I be getting WARNING - no common ancestor: path when merging one branch into another ? -bch ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] no common ancestor
On Wed, Jun 18, 2014 at 1:52 PM, B Harder brad.har...@gmail.com wrote: If everything is (ultimately) spawned from the initial empty checkin, how can I be getting WARNING - no common ancestor: path when merging one branch into another ? Perhaps a shun broke the check-in chain somewhere along the way. There is the fossil test-ancestor-path HASH1 HASH2 command that you can use to find common ancestors between two arbitrary check-ins. Perhaps you can use that to figure out where the problem sits. -- D. Richard Hipp d...@sqlite.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] no common ancestor
Thus said B Harder on Wed, 18 Jun 2014 10:52:22 -0700:
If everything is (ultimately) spawned from the initial empty
checkin, how can I be getting WARNING - no common ancestor: path
when merging one branch into another ?
How did you get to this error? In my case, I am able to cause it with
the following test Fossil:
http://fossil.bradfords.org:8080/
If you clone that and then try to merge the branch named ``four'' with
trunk you'll get this error:
$ fossil merge trunk
cannot find a common ancestor between the current checkout and trunk
The checkin in branch ``four'' is a merge with cherry picking of a part
of trunk.
What does the manifest for the checkin that gives the errorlook like?
$ fossil artifact `fossil info | grep checkout | awk '{ print $2 }'`
Andy
--
TAI64 timestamp: 400053a1df8b
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] no common ancestor
Thus said Richard Hipp on Wed, 18 Jun 2014 13:55:32 -0400: There is the fossil test-ancestor-path HASH1 HASH2 command that you can use to find common ancestors between two arbitrary check-ins. Perhaps you can use that to figure out where the problem sits. Nifty command. Here's the output for the particular case I pointed out: $ fossil test-ancestor-path d5de0c469b d07278c11c 1:13 d5de0c469b04 2014-06-18 18:38:49 VERSION1 2:11 61549ff3772e 2014-06-18 18:38:33 3: 9 b6e320bcdac2 2014-06-18 18:38:24 4: 3 a7c3818537c0 2014-06-18 18:35:59 PIVOT 5: 5 7fba82feb33a 2014-06-18 18:36:12 6: 7 82a44e997365 2014-06-18 18:35:00 7:15 d07278c11c50 2014-06-18 18:39:25 VERSION2 Should I be expecting an error here given that if I try to merge d07278c11c50 into d5de0c469b04 I get the error that there is no common ancestor? Seems like this actually did find a common ancestor on line 4, unless I misunderstand this output. Thanks, Andy -- TAI64 timestamp: 400053a1e0dc ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] no common ancestor
IIRC this can happen if a file is created independently in both branches. On Wed, Jun 18, 2014 at 10:55 AM, Richard Hipp d...@sqlite.org wrote: On Wed, Jun 18, 2014 at 1:52 PM, B Harder brad.har...@gmail.com wrote: If everything is (ultimately) spawned from the initial empty checkin, how can I be getting WARNING - no common ancestor: path when merging one branch into another ? Perhaps a shun broke the check-in chain somewhere along the way. There is the fossil test-ancestor-path HASH1 HASH2 command that you can use to find common ancestors between two arbitrary check-ins. Perhaps you can use that to figure out where the problem sits. -- D. Richard Hipp d...@sqlite.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Matt -=- 90% of the nations wealth is held by 2% of the people. Bummer to be in the majority... ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
