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

[Daniel Carosone]

On Fri, Oct 06, 2006 at 08:51:04AM -0700, Dmitry Kakurin wrote:
> The way I understood it: every directory has a unique GUID, so my CS
> directories have same names but different GUIDs and they are not
> related (for Monotone).
> Furthermore, since they don't have a common ancestor, they cannot be
> merged using 3-way merge. And this is why it's a conflict.

As noted already, GUID is the wrong term (they're database-local id's
internal to rosters), but otherwise yes, that's exactly correct.

> Now, I expect conflicts to be presented to the user for conflict
> resolution. And I'd like to be able to perform baseless (2-way) merge
> in this case. I would even expect this merge to happen automatically
> (once I initiate it) since there are no file name conflicts (only dir
> names).

Understood.  Amongst other reasons, there are UI issues of how to
present and interact with the user through such a merge.  Along with a
class of similar non-content conflicts (such as on attrs) the current
way to resolve these is to commit changes on one side of the other
before retrying the merge. 

But there are also other real issues here; even though no filenames
conflict, just merging the directories automatically may really not be
the right thing for some directories.

> I also wonder why keeping track of dirs is necessary. Perforce (for
> example) gets away with only keeping track of files and creates dirs
> on demand.

I'll let others answer in detail here, but this approach caused all
sorts of real and essentially unfixable merging problems before
monotone 0.26.

--
Dan.

pgp9RSpik0gWP.pgp
Description: PGP signature