Re: [Monotone-devel] merging interface

[Christof Petig]

Richard Levitte - VMS Whacker schrieb:
> In message <address@hidden> on Wed, 17 Nov 2004 13:34:23 +0000, Bruce Stephens 
> <address@hidden> said:
>
> monotone> Really what I'd like is to be left with a working tree with
> monotone> the conflicting files indicated in some way: then I can deal
> monotone> with them in an order that makes sense to me, and I can
> monotone> perform whatever sanity checks on the merged tree that make
> monotone> sense.  Then I can make sure that my merge cert actually
> monotone> means something about the revision.
>
> Basically, you're asking for a method that's very close to CVS', doing
> the merge in your work directory, let you do the work of fixing the
> differences, and finish it off with a commit.  The trouble I see is
> that monotone will probably have no chance to see the difference
> between a merging commit and a normal commit, and you will find
> yourself without a merge cert.  Do you have any ideas how to solve
> that?

What do you think about the proposals in thread
http://lists.gnu.org/archive/html/monotone-devel/2004-05/msg00045.html
(continued at)
http://lists.gnu.org/archive/html/monotone-devel/2004-06/msg00081.html

It seems to me that the conclusion was a reasonable design though 
Graydon was not overly fond of adding the feature of a partially merged 
tree.

Since my ssh extension actually works I can look into new grounds 
(sqlite3 (aka more speed, less space) and in tree merging)
    Christof

signature.asc
Description: OpenPGP digital signature