Re: No commit in vc?

[David De La Harpe Golden]

Thien-Thi Nguyen wrote:


> What this thread has taught me is that for bzr, "merge" does
> not imply "commit".  To DTRT, VC "merge" should allow for
> this split in all backends, 

Yeah, merge doesn't necessarily imply commit in git either, e.g. when 
there's conflicts... and you can in fact suppress automagic stuff with 
"git merge --no-commit --no-ff"

(the --no-ff stops it doing a fastforward even if a fastforward
is possible. Actually, you'd seldom want to not do it, but the option's
there in vaguely recent git, contrary to what bzr folk seemed to think IIRC)