Re: [Monotone-devel] cooperative/parallel/resumed merging

[Lele Gaifax]

>>>>> "Christof" == Christof Petig <address@hidden> writes:

    Christof> The only problem arises from conflicts. Possibilities
    Christof> are:

    Christof> CVS style markers (perhaps inferior to real 3way merge
    Christof> tools). Conflicts might get overlooked and commited
    Christof> (does CVS do pattern matching to tell whether a conflict
    Christof> was resolved or modification time comparison?)

No, CVS does not check conflict resolutiond: that why it's not so
uncommon to commit them in the repos :]

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.

ciao, lele.
-- 
nickname: Lele Gaifax   | Quando vivrò di quello che ho pensato ieri
real: Emanuele Gaifas   | comincerò ad aver paura di chi mi copia.
email: address@hidden   |               -- Fortunato Depero, 1929.