Hello Richard and friends, I continue below this old thread, where I still had not found deeper what was failing in our merges. Now I add more information.
2011/3/3 Richard Hipp <d...@sqlite.org>: > 2011/3/3 Lluís Batlle i Rossell <virik...@gmail.com> >> Maybe the problem is in the handling of renames, then, and I mixed all >> with the >> 'shortest-path' algorithm, which may have played no role. Sorry for this >> noise. >> >> So no wonder that with --baseline or without it, it behaves the same. >> "test-find-pivot" finds properly the ancestor, but I don't understand why >> it >> thinks there is no common ancestor for those files. > > There is an undocumented --debug option to "merge" that provides additional > information about how the merge is trying to deal with name changes and > whatnot. I've hit again this problem in another merge. I've a leaf of a branch made from trunk, that I did not merge from trunk since a long time. Now I'm running "fossil merge trunk" there, and there are rename problems. Seeing that the merge code uses the find_name_changes, I've used the test-name-changes and test-shortest-path to track down the problems I'm finding. The branch X where I am: Last commit: 2011-05-09. Last update from trunk: 2011-03-03 (result of test-find-pivot). Trunk: Last commit: 2011-05-23 In trunk, there are two commits, one child of the other: e39dfeb63a1d (2011-04-29) child of 8d4432b6b9 (2011-05-02) If I run "test-name-changes e39dfeb63a1d trunk", I get no output. If I run "test-name-changes 8d4432b6b9 trunk", I get seven filename changes. These changes *did not* happen in these commits mentioned. And now for the shortest path, see the huge differences. Note that the 8d44 goes back to *January*, where there had happened some renames. $ fossil test-shortest-path e39dfeb63a1d trunk 1: e39dfeb63a1d 2011-05-02 08:07:48 is a parent of 2: 64914698fe8f 2011-05-02 08:20:36 is a parent of 3: b5d6bae30b30 2011-05-02 09:41:28 is a parent of 4: 973d5fe26620 2011-05-02 10:57:27 is a parent of 5: eb423f492c02 2011-05-02 13:53:06 is a parent of 6: 990105642834 2011-05-04 08:23:28 is a parent of 7: 3091adb58f30 2011-05-04 13:00:50 is a parent of 8: 329bb13883b8 2011-05-05 08:44:17 is a parent of 9: b42aec5d833f 2011-05-05 12:44:04 is a parent of 10: 0efca45eb840 2011-05-05 13:10:56 is a child of 11: b5cbbb485af5 2011-05-05 13:10:25 is a parent of 12: 7f542fddedd9 2011-05-06 13:17:14 is a parent of 13: a0185efc4806 2011-05-06 15:30:28 is a parent of 14: 88ed563d9012 2011-05-09 13:39:58 is a parent of 15: 66bafc70edeb 2011-05-16 08:58:46 is a parent of 16: 833a1e8f8040 2011-05-16 10:25:35 is a parent of 17: c922e75db613 2011-05-16 15:13:51 is a parent of 18: 3016ba14a93a 2011-05-17 07:58:52 is a parent of 19: 869d3bf69a6b 2011-05-17 10:07:39 is a parent of 20: 9092b7884f8b 2011-05-17 13:18:05 is a parent of 21: df749296cec0 2011-05-18 09:53:47 is a parent of 22: 71cc67880028 2011-05-20 09:01:52 is a parent of 23: 6adf9a899750 2011-05-20 14:07:42 is a parent of 24: 4ecf25e9a372 2011-05-23 13:43:24 is a parent of 25: 6c7803846985 2011-05-23 13:48:12 is a parent of 26: f094c8032b79 2011-05-23 15:14:46 $ fossil test-shorest-path 8d4432b6b9 trunk 1: 8d4432b6b920 2011-04-29 13:29:52 is a child of 2: 3f8e8f1ad0cd 2011-04-29 12:59:37 is a child of 3: 8b49bc80c2ca 2011-04-29 12:49:06 is a child of 4: 81df7a7a981e 2011-04-29 10:35:08 is a child of 5: b36179b7064b 2011-04-29 08:57:49 is a child of 6: 29563ee1421c 2011-04-29 08:41:18 is a child of 7: 50c3d39e6740 2011-04-29 08:26:28 is a parent of 8: f494a26577c3 2011-04-29 09:41:15 is a child of 9: 87b7e612b780 2011-04-12 09:55:30 is a child of 10: 2eff6425fdaa 2011-03-30 10:16:58 is a child of 11: 4e2fde4f6daa 2011-03-07 11:27:44 is a child of 12: b1681a484058 2011-01-24 11:55:03 is a child of 13: a642cc1d3533 2011-01-24 09:53:54 is a child of 14: cc0d4a0911cf 2011-01-21 15:26:28 is a child of 15: 8f39373df19c 2011-01-21 14:42:50 is a child of 16: 4754938581cf 2011-01-21 11:26:14 is a parent of 17: 5c5d328c2ff8 2011-01-21 14:34:09 is a parent of 18: d9ab1f85c154 2011-01-21 15:00:00 is a parent of 19: 88a8eb3f7dff 2011-01-21 15:27:21 is a parent of 20: f4958b90f229 2011-01-21 16:46:21 is a parent of 21: 0bae47c6456d 2011-02-15 10:38:12 is a parent of 22: e13ccbeea9f0 2011-02-24 12:01:27 is a parent of 23: 4ecf25e9a372 2011-05-23 13:43:24 is a parent of 24: 6c7803846985 2011-05-23 13:48:12 is a parent of 25: f094c8032b79 2011-05-23 15:14:46 Do you know how to get this solved? _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
