Nathaniel Smith writes: > rev 1: add dir "blah" > rev 2 (child of rev 1): delete dir "blah" > rev 3 (child of rev 1): add files "blah/foo", "blah/bar" > > and then you merged revs 2 and 3. Since "blah" was deleted in > 2, and left alone in 3, in new merged rev, there is no "blah" > directory. However, since the files "blah/foo" and "blah/bar" > were both created in 3, they _do_ exist in the new merged rev.
Thank you for the explanation. The branch in question is very messed up, unfortunately, I remember doing several wild directory renames. My biggest problem is figuring out _what exactly_ to change to fix the problem. Both heads are identical ... diff -r head1 head2 diff -r head1/_MTN/revision head2/_MTN/revision 1c1 < 1bfd0c9f4a347913d2573f3bf8b5e3192350f6a8 --- > 1f7b551d990fa8d8f64072f6563874312e3ed62d ... but apparently the problem is in their history. When Monotone prints an error message like this one: mtn: warning: orphaned node conflict on node 20547, dead parent 52, name foo I simply don't know what it means! What is a "node"? How does that translate to a revision? Peter _______________________________________________ Monotone-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/monotone-devel
