[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mercurial
Subject:    Re: [PATCH 1 of 1] hgmerge revamp
From:       Radoslaw Szkodzinski <astralstorm () gorzow ! mm ! pl>
Date:       2006-01-31 18:50:20
Message-ID: 43DFB16C.5050402 () gorzow ! mm ! pl
[Download RAW message or body]

[Attachment #2 (multipart/signed)]


Matt Mackall wrote:
> On Sun, Jan 29, 2006 at 05:09:05PM +0100, "Radoslaw Szkodzinski \
> <astralstorm@gorzow.mm.pl>"@zen.uplink wrote:
> > # HG changeset patch
> > # User "Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>"
> > # Node ID 36be990fe0d16b8793ad276659567d49623a1b63
> > # Parent  b2df93c56ac47c24c46e193c5afdc5a6f687c8a6
> > hgmerge revamp
> > 
> > Details:
> > - reduced code duplication
> > - global cleanup functions
> > - additional variables to override paths of external utilites
> 
> Rewrites are trouble. I can't look at this patch and say, "yes, it's
> all obviously correct" because there are too many unrelated changes
> happening at the same time. It also makes it harder for both of us if
> I want to reject or revert a particular piece.
> 
> Please do this sort of change one step at a time. Breaking it up by
> your bullet points above would probably be fine.
> 
> This will have to wait until after 0.8 at any rate.
> 

Hmm. So I'll try to break up the changes into these parts.

The first one will be the cleanup. (traps, functions, additional variables)
Second will contain logic change ($LOCAL keeps merged version with conflicts).
Third will streamline diff3 and merge error handling.
Fourth will add meld support (depends on the second).

The cleanup unfortunately will be big, because it requires me to change
almost every line in the file containing exit.

Will make the patches tomorrow (+12h).

-- 
GPG Key id:  0xD1F10BA2
Fingerprint: 96E2 304A B9C4 949A 10A0  9105 9543 0453 D1F1 0BA2

AstralStorm


["signature.asc" (application/pgp-signature)]

_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial


[prev in list] [next in list] [prev in thread] [next in thread]