|
From: | Christof Petig |
Subject: | Re: [Monotone-devel] cooperative/parallel/resumed merging |
Date: | Wed, 23 Jun 2004 13:18:44 +0200 |
User-agent: | Mozilla/5.0 (X11; U; Linux ppc; de-AT; rv:1.6) Gecko/20040414 Debian/1.6-5 |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Lele Gaifax schrieb:
Subversion instead behaves a little different: it still insert conflicts marker ala CVS, but creates also three other files in the form "filename.c.r8510", "filename.c.r8513", "filename.c.mine", respectively the ancestor, the new version, and my own version, as it was before the merge. Then there is an explicit "svn resolved filename.c" that needs to be executed before the commit can proceed.
looks very similar to my proposal (though I don't put any more file in the tree - but delete the conflicting one (this remains to be discussed)).
Christof -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) Comment: Using GnuPG with Debian - http://enigmail.mozdev.org iD8DBQFA2WcYng+R+0ucfO0RAjvNAJsGvY1yGmNZHeIy6CTrECZxKcC/EwCeJK3j zB/3OwO6FGPvibTV75Yy94U= =sfYp -----END PGP SIGNATURE-----
[Prev in Thread] | Current Thread | [Next in Thread] |