Re: VCS comparison table

On 25/10/06, Jakub Narebski [off-list ref] wrote:

Andreas Ericsson wrote:

quoted

This is new to me. At work, we merge our toy repositories back and forth
between devs only. There is no central repo at all. Does this mean that
each merge would add one extra commit per time the one I'm merging with
has merged with me?

From what I understand, "bzr merge" will create one extra commit to
preserve the "first parent is my branch" feature. "bzr pull" will do
fast-forward if your DAG is proper subset of pulled branch/repository
DAG, but at the cost that it would change your revno to revision mapping
to those of the pulled repository.

Actually, "bzr merge" does not create any commits on the branch -- you
need to run "bzr commit" afterwards (possibly after resolving
conflicts).  The control files for the working tree record a pending
merge, which gets recorded when you get round to the commit.

So you can easily check if there were any tree changes resulting from the merge.

If there aren't, or you made the merge by mistake, you can make a call
to "bzr revert" to clean things up without ever having created a new
revision.

James.