From: Sam Ravnborg Date: Sun, 22 May 2005 07:14:35 GMT Subject: Re: cogito - how do I ??? Message-ID: <20050522071435.GA10681@mars.ravnborg.org> In-Reply-To: > > > 1) Something similar to "bk changes -R". I use this to see what has > > > happened upstream - to see if I really want to merge stuff. > > > > Not sure what bk did here, but you can do something like: > > > > cg-pull origin > > cg-log -c -r origin > > In the raw git interfaces, you'd basically have to do the same thing that > "git-pull-script" does, except that _instead_ of calling the > git-resolve-script thing, you'd do > > git-rev-tree MERGE_HEAD ^HEAD | git-diff-tree -v -m -s --stdin That looks ... long. I can teach my fingers to use: cg-log, but the above is just too much to type/remeber do a daily operation. In bk the usage pattern was to check what was in mainline _before_ fetching and merging. So it seems that with git/cogoto one has to fetch the chages, inspect them, and then decide to apply or not. When the fetches changes stay in MERGE_HEAD I assume my work when committed will be based on top of HEAD - so I do not have to know if I have fetched some (unmerged) updates. > to show what is in the downloaded MERGE_HEAD but not in HEAD. > > > > 2) Export of individual patches. "bk export -tpatch -r1.2345" > > > I have nu public git repository yet so I have to feed changes as > > > plain patches. Browsing cg-* I did not find the command to do this. > > > > cg-diff -p -r SHA1 > > And again, without the porcelain this is: > > git-diff-tree -v -p The key here is the SHA1. I hoped to avoid specifying SHA1's with cogito, I so often miss one character when doing copy'n'paste. Thanks all for the replies. Now I feel a bit more confident in this. Sam