Re: questions about cg-update, cg-pull, and cg-clone.

On Fri, Apr 29, 2005 at 10:37:29PM -0400, David A. Wheeler wrote:

Zack Brown wrote:

quoted

Now, if the update is clean, a cg-commit is invoked automatically,

Correct; cg-merge calls "cg-commit -C" (ignore cache)
if the merge is clean.

quoted

and if the
update is not clean, I then have to resolve any conflicts and give the 
cg-commit
command by hand.

Correct.

quoted

But: what is the significance of either of these cg-commit
commands? Why should I have to write a changelog entry recording this 
merge? All
I'm doing is updating my tree to be current. Why should I have to 'commit' 
that
update?

I can't speak Petr, but I would guess that he's doing that because
he's trying to avoid data loss.

So, what would be an appropriate comment for that commit? I have no idea
what is changing on my tree in that case, all I know is that I'm merging from
someone else. All I really want is their changes and their commit messages,
not one of my own that is meaningless.

So far I just type ^d when this happens, and leave the commit message blank.

Be well,
Zack

-- 
Zack Brown