Re: cogito - how do I ???

From: Sean <seanlkml@sympatico.ca>
Date: May 21, 2005, 22:06 UTC
Message-ID: <2765.10.10.10.24.1116713164.squirrel@linux1>
In-Reply-To: <20050521214700.GA18676@mars.ravnborg.org>

On Sat, May 21, 2005 5:47 pm, Sam Ravnborg said:

Show 7 quoted lines

> Hi all.
>
> While trying to get up to speed on cogito/git I stumbled across
> a few things that I at least did not find available in cogito.
>
> 1) Something similar to "bk changes -R". I use this to see what has
> happened upstream - to see if I really want to merge stuff.

Not sure what bk did here, but you can do something like:

cg-pull origin cg-log -c -r origin

To see what is at the head of the unmerged objects you just pulled down, and if you want to merge then "cg-merge origin". Although as far as I know there's no way to have the log stop automatically at the proper spot.

> 2) Export of individual patches. "bk export -tpatch -r1.2345"
> I have nu public git repository yet so I have to feed changes as
> plain patches. Browsing cg-* I did not find the command to do this.

cg-diff -p -r SHA1

Which asks for the diff from the parent (-p) to the revision (-r).

Sean