Re: [Monotone-devel] Multiple projects in one database -- branch confusion

[Brian May]

>>>>> "Steven" == Steven E Harris <address@hidden> writes:

    Steven> Does monotone see any relationship between the two files
    Steven> "./one.txt"?  They are in the same place with the same
    Steven> name with respect to some root directories, but at their
    Steven> conception these two roots had nothing to do with one
    Steven> another.

No, monotone will not see any relationship between the files, as they
are independent and haven't come from a common revision. It will see
the two files as conflicting files, even if the contents are the same.

Note, the same also applies to directories, including the root project
directory. Merging two trees that have conflicting root directories is
becoming a common request, see the archives for this mailing list.

Ideally the merge user interface needs to improved so that these
conflicts can be dealt in an easier fashion.
-- 
Brian May <address@hidden>