From: Alan Chandler <alan@chandlerfamily.org.uk>
Date: Wed, 27 Apr 2005 22:15:22 GMT
Subject: Re: Cogito Tutorial If It Helps
Message-ID: <200504272315.22939.alan@chandlerfamily.org.uk>
In-Reply-To: <20050427193227.GF22956@pasky.ji.cz>

On Wednesday 27 April 2005 20:32, Petr Baudis wrote:

> Those commands affect your working tree:
>
> 	cg-cancel
> 		Cancels out any modifications in the working tree w.r.t.
> 		the last commit
> 	cg-merge
> 		Merges changes done in another branch to your current
> 		branch
> 	cg-patch
> 		Applies a patch, with regard to special git-specific
> 		info generated by cg-diff
> 	cg-rm
> 		Removed the file from your working tree if it's still
> 		around
> 	cg-seek
> 		Changes your working tree to match some other commit in
> 		the database
> 	cg-update
> 		Potentially brings in changes from a remote branch, and
> 		updates your working tree to the latest commit + those
> 		changes
>
> Those commands affect the objects database:
>
> 	cg-commit
> 	cg-pull
> 		cg-pull just gets the data from remote objects database
> 		to the local objects database; it is the "first part"
> 		of what cg-update does
> 	cg-update
>
> This affects both:
>
> 	cg-merge
> 		Not directly, but it can call cg-commit automatically.
> 	cg-update


Thanks - that makes things a lot clearer

>
> > The reason I raise all this, is when I follow through on your tutorial
> > and get to the cg-diff stage I get this
> >
> > xargs: cg-Xdiffdo: No such file or directory
> >
> > And I have absolutely no idea whats wrong or where to start looking.
>
> You didn't do make install and you don't have the cogito tree in your
> $PATH.

I DID do a make install - which put everything in ~/bin (including cg-Xdiffdo) 
and ~/bin is the first item in my $PATH.


-- 
Alan Chandler
http://www.chandlerfamily.org.uk