Re: [Monotone-devel] usage question

[Brian May]

>>>>> "Thomas" == Thomas Moschny <address@hidden> writes:

CCing response to submitter as Thomas forgot :-(

    Thomas> Arthur A. Gleckler wrote:
    >> Is there any problem starting with   two versions of a file
    >> that don't, in fact, have a common ancestor in   Monotone?

    Thomas> Yes. In a merge, two nodes (files or dirs) can't have the
    Thomas> same name, if they don't share a common ancestor.

    >> mtn: warning: rename target conflict: nodes 3, 1, both want
    >> parent 0, name [...]  Is there a way to have Monotone tell me
    >> about the conflicts by name?

    Thomas> It already does tell you the name, but in this special
    Thomas> case this happens to be the root directory, which is named
    Thomas> '' (empty string). Our UI needs some polishing there,
    Thomas> though :)

Maybe add "/" to start of string?

Hmm, this might confuse/panic some people. Maybe not such a good
idea. Anyway, just a thought.
-- 
Brian May <address@hidden>