Re: cogito and merging in steps.

From: Petr Baudis <pasky@suse.cz>
Date: Sep 12, 2005, 00:11 UTC
Message-ID: <20050912001105.GC15630@pasky.or.cz>
In-Reply-To: <46a038f9050822232961140d4b@mail.gmail.com>

Dear diary, on Tue, Aug 23, 2005 at 08:29:46AM CEST, I got a letter where Martin Langhoff <martin.langhoff@gmail.com> told me that...

Show 14 quoted lines

> I want to be able to 
>  - cg-update
>  - oops! this is a mess! review with cg-log -r master:origin
>  - aha! Here is the conflict in the 9th commit from MacFroz, fire off
> email / open irc session
>  - in the meantime, reset the working copy and merge the 8 clean ones
> with something like: cg-restore ; cg-update origin^^^ ; cg-commit
>  - cg-update origin^ ; emacs file-with-conflict.c ; cg-commit 
>  - cg-update # bring in the last pending commit from origin. 
> 
> How can I achieve the cg-update <somepointinthebranch> ; cg-commit ? I
> mean, without faking a head with
> 
>   echo <somepointinthebranch> > .git/refs/heads/temphead

Theoretically, it should be as easy as

	cg-merge <somepointinthebranch>

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
If you want the holes in your knowledge showing up try teaching
someone.  -- Alan Cox