Re: [PATCH] Introducing cg-xxdiff for conflict resolution

From: Petr Baudis <pasky@suse.cz>
Date: Sep 24, 2006, 17:28 UTC
Message-ID: <20060924172838.GZ13132@pasky.or.cz>
In-Reply-To: <46a038f90609241022i6ac11da1o1a1cba199595d036@mail.gmail.com>

Dear diary, on Sun, Sep 24, 2006 at 07:22:35PM CEST, I got a letter where Martin Langhoff <martin.langhoff@gmail.com> said that...

Show 17 quoted lines

> On 9/24/06, Petr Baudis <pasky@suse.cz> wrote:
> >In that case I think the most natural way for this tool to interface
> >would be in part of some kind of cg-resolve swiss-army knife for
> >resolving conflicts:
> >
> >       cg-resolve --mine       for taking just the version from _my_
> >                               side of the merge
> >       cg-resolve --other      dtto for the other side of the merge
> >       cg-resolve -g           graphically resolve
> >                               (vimdiff/xxdiff/meld/...)
> >       surely more would be invented over time
> 
> Sounds reasonable. But I think we have to keep in mind that you only
> know if the conflict is nasty after you have a go at fixing it. And I
> sometimes find that I try with cg-xxdiff... and I go back to the plain
> old conflict. That is why it doesn't clobber the file -- to protect a
> manual merge in process.

Oh yes, I wanted to complain about that. ;-)

Yes, sometimes it is useful to go back, but I guess most of the time probably not (not speaking from the experience though) and I hate tools which leave random copies of a file I have tracked in a VCS around and I have to collect their garbage manually.

The tool should just have a way to tell it "cancel" in case of trouble and restore the original state of the file. And of course

	cg-resolve --remerge	re-run the 3-way merge on the file

would be useful anyway.

Show 5 quoted lines

> >But I can adjust such details when applying your patch.
> 
> Great! -- I'm travelling and at an airport "free access" computer. It
> should be illegal to run airports without free wifi in this day and
> age.

Heartily agreed.

We should always suggest the locals to build yet another airport right near the old one to promote free market and competition!

And when one of them bankrupts it could make for a nice paintball arena, I guess.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
#!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj
$/=unpack('H*',$_);$_=`echo 16dio\U$k"SK$/SM$n\EsN0p[lN*1
lK[d2%Sa2/d0$^Ixp"|dc`;s/\W//g;$_=pack('H*',/((..)*)$/)