Non-expected conflict

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jan Hudec wrote:
> On Wed, Mar 22, 2006 at 15:14:29 -0300, Gustavo Niemeyer wrote:
> 
> I'd like to add that none of monotone, git, mercurial, subversion or
> svk, nor any commercial versioning tool I've ever heard of, would do
> any better.

BitKeeper would.  Codeville would.  Darcs should, but last I heard,
criss-cross gave it indigestion.

> Some of them, eg. monotone, would choose the dominator
> revision, which would give more, but less confusing, conflicts.

You'd still get Gustavo's changes conflicting with Gustavo's later
changes, so I think they'd be pretty confusing.

>>[...]
>>
>>Understood. Thanks for explaining.
> 
> 
> We should however try to think about what could be useful for
> understanding conflicts when they happen. Maybe some kind of annotation
> or synthetic base.

You mean emitting a synthetic BASE for weave merge?

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEIuQK0F+nu1YWqI0RAl5lAJ9iMUM7pdqXm790jc5ySjYWEAxh0ACeLpqH
muYOVd1z2WhjnqEGyoJj+FQ=
=MdkZ
-----END PGP SIGNATURE-----