From: James Purser Date: Tue, 26 Apr 2005 21:36:43 GMT Subject: Re: Cogito Tutorial If It Helps Message-ID: <1114551403.3083.3.camel@kryten> In-Reply-To: <20050426211834.GO13224@pasky.ji.cz> On Wed, 2005-04-27 at 07:18, Petr Baudis wrote: > Dear diary, on Tue, Apr 26, 2005 at 10:52:27PM CEST, I got a letter > where James Purser told me that... > > I reworked the previous tutorial to take in the changes in the scripts. > > Will make this a series of tutorials to cover all aspects. Any > > suggestions or hints or spelling corrections would be most welcome. > > > > http://ksit.dynalias.com/articles.php?s_id=46&art_id=41 > > Thanks for writing that! :-) > > I'd vote for describing the cg-update right near cg-pull, or perhaps > even before cg-update, as the primary method; I think it's commonly what > people really want to do when they do cg-pull anyway. > > cg-merge is _not_ like doing cg-diff | cg-patch - that's a dangerous > thought, and not true at all. cg-diff | cg-patch will just apply the > given diff to your working directory, but it won't record any merging > metadata, will often get it very wrong, and you will get to all sorts of > other troubles. Just always use cg-merge. And probably pass it -b only > when you know what are you doing. > > Thanks, Thanks for that, I've changed it a little to point out that cg-patch should really only be used for small single file patches. -- James Purser http://ksit.dynalias.com