Bruce Stephens wrote:
Thomas Keller <[EMAIL PROTECTED]> writes:
[...]
This means that two files/directories are equally named but have no
common ancestry. However I can't tell you what two entries these are
from the node numbers. Note to devs: Wasn't this supposed to be made
more user friendly i.e. so it outputs file paths instead of those
numbers?
If I understand things correctly in the case of unrelated revisions
the roots will always conflict in this way. Hence merge_into_dir.
(And, possibly, pivot_root, but I think merge_into_dir is intended for
this situation.)
I think propagate is the proper thing to use here. I think initially
when we switched to rosters the roots would conflict, but now that has
been fixed.
--
Matthew A. Nicholson
matt-land.com
_______________________________________________
Monotone-devel mailing list
Monotone-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/monotone-devel
