Re: Cogito Tutorial If It Helps
- From
Petr Baudis <pasky@ucw.cz>
- Date
- Apr 26, 2005, 21:18 UTC
- Message-ID
- <20050426211834.GO13224@pasky.ji.cz>
- In-Reply-To
- <1114548747.3083.1.camel@kryten>
Dear diary, on Tue, Apr 26, 2005 at 10:52:27PM CEST, I got a letter where James Purser <purserj@ksit.dynalias.com> told me that...
Show 5 quoted lines
> 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,
-- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor