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: 4000000053a1e0dc _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
