Re: [PATCH] cg-commit --review may permanently delete changes

From: Petr Baudis <pasky@suse.cz>
Date: Sep 24, 2006, 15:50 UTC
Message-ID: <20060924155048.GR20017@pasky.or.cz>
In-Reply-To: <20060728171152.G3a9ef049@leonov.stosberg.net>

Dear diary, on Fri, Jul 28, 2006 at 07:11:52PM CEST, I got a letter where Dennis Stosberg <dennis@stosberg.net> said that...

Show 8 quoted lines

> If the patch is changed in the editor in such a way that cg-patch
> can not apply it, all changes made since the last commit are
> irrecoverably lost, which is _really_ bad.
> 
> This patch lets cg-commit reapply the old patch and keep the edited
> patch for manual fix-up.
> 
> Signed-off-by: Dennis Stosberg <dennis@stosberg.net>

Hmm, good catch. Unfortunately, we can't safely patch the original patch over that either, since bits of the edited patch _might_ got applied.

As the first step, I've prevented Cogito from deleting any of the temporary files and now it instead reports their name to the user and lets him fix up the situation.

As the second stage, we should restore the original state of the tree. I will do it when I get to it, patches welcome. :-)

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