From: Petr Baudis <pasky@ucw.cz>
Date: Wed, 27 Apr 2005 19:32:27 GMT
Subject: Re: Cogito Tutorial If It Helps
Message-ID: <20050427193227.GF22956@pasky.ji.cz>
In-Reply-To: <200504271922.07765.alan@chandlerfamily.org.uk>

Dear diary, on Wed, Apr 27, 2005 at 08:22:07PM CEST, I got a letter
where Alan Chandler <alan@chandlerfamily.org.uk> told me that...
> Where I am confused is the relationship between what is in the .git 
> subdirectory and the project tree of cogito that sits around it.  Obviously I 
> understand that its the latest version of the project as represented by the 
> objects in the repository, but what I don't really understand (and neither 
> your tutorial nor all the explanations of each of the commands in the README 
> really explain it either) is how the various commands adjust the 
> relationship.
> 
> For instance cg-branch-add seems to add a branch to the repository from a url 
> (I assume it downloads any "blobs" etc that are not already in my local 
> repository and creates a tag that identifies the head of a tree object), but 
> a don't understand how I am supposed see that particular branch as expanded 
> code.  (I suspect it might be cg-seek, but I am not really sure - and if it 
> is how do you find out what branch this expanded code is now pointed to?).  
> But what do cg-update and cg-pull do in terms of the uncompressed code 
> sitting in the surrounding directory round the repository, particularly when 
> you perform them on a branch that is not the one that the code refers to.  

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

> 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.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor