From mboxrd@z Thu Jan 1 00:00:00 1970 From: Petr Baudis Subject: Re: Cogito Tutorial If It Helps Date: Wed, 27 Apr 2005 21:32:27 +0200 Message-ID: <20050427193227.GF22956@pasky.ji.cz> References: <1114548747.3083.1.camel@kryten> <200504271922.07765.alan@chandlerfamily.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Apr 27 21:28:12 2005 Return-path: Received: from vger.kernel.org ([12.107.209.244]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DQsBo-0004Dy-3y for gcvg-git@gmane.org; Wed, 27 Apr 2005 21:27:16 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261975AbVD0Tch (ORCPT ); Wed, 27 Apr 2005 15:32:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261976AbVD0Tch (ORCPT ); Wed, 27 Apr 2005 15:32:37 -0400 Received: from w241.dkm.cz ([62.24.88.241]:49576 "HELO machine.sinus.cz") by vger.kernel.org with SMTP id S261975AbVD0Tcd (ORCPT ); Wed, 27 Apr 2005 15:32:33 -0400 Received: (qmail 31974 invoked by uid 2001); 27 Apr 2005 19:32:27 -0000 To: Alan Chandler Content-Disposition: inline In-Reply-To: <200504271922.07765.alan@chandlerfamily.org.uk> User-Agent: Mutt/1.4i X-message-flag: Outlook : A program to spread viri, but it can do mail too. Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Dear diary, on Wed, Apr 27, 2005 at 08:22:07PM CEST, I got a letter where Alan Chandler 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