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

From: Petr Baudis <pasky@suse.cz>
Date: Sep 24, 2006, 16:50 UTC
Message-ID: <20060924165037.GS20017@pasky.or.cz>
In-Reply-To: <11546624471356-git-send-email-martin@catalyst.net.nz>

Dear diary, on Fri, Aug 04, 2006 at 05:34:07AM CEST, I got a letter where Martin Langhoff <martin@catalyst.net.nz> said that...

> This is a bit of a crude but really useful shortcut for conflict resolution.
> The name is bad, but matches git-xxdiff which has been around for like... ages

Yes, the name is horrible. :-)

Show 5 quoted lines

> As Cogito doesn't make use of the index during merges/applies, cg-xxdiff
> is somewhat more brittle and cannot not help during conflict resolution when
> using cg-patch.
> 
> Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>

Hmm, I think this would be generally more useful during the actual merge phase - if merge returns error, you fire up git-magic-conflict-resolution-driver and have fun.

Which reminds me that I should make some more effort to unify cg-Xmergeonefile and git-merge-one-file...

> +. git-sh-setup

Uh-oh. :-)

> +git cat-file blob `git rev-parse FETCH_HEAD`:$FILE > $FILE~branch

Cogito does not use FETCH_HEAD.

-- 
				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*',/((..)*)$/)