[Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?

[Bruce Stephens]

Thomas Keller <address@hidden> 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.)