[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: some bzrmerge.el questions

From: Stefan Monnier
Subject: Re: some bzrmerge.el questions
Date: Tue, 18 Jan 2011 10:12:08 -0500
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

> I realize I am confused by "skipping". Naively, I thought skipping
> would exclude the relevant revision entirely. However, a comment in
> bzrmerge-apply says that it still merges the meta-data. I guess this
> explains why revno: 99634.2.749 "!!!DO NOT MERGE TO THE TRUNK!!!" [1]
> now shows up in `bzr log -n0' output on the trunk, even though I said
> it should be skipped. Isn't it confusing to not merge the data, but
> still merge the meta-data?

There is simply no way in Bzr to merge part of a branch history: the
only kind of merge info recorded in the metadata says "all the branch
upto <foo> has been merged".

And really if you think about it, those "don't merge to trunk" changes
are usually changes which have already been performed on the trunk (tho
in a slightly different way, typically), so "applying" the corresponding
change amounts to doing nothing: if you used "bzr merge" instead of "M-x
bzrmerge", then you'd get spurious conflicts which you'd resolve by
choosing the pre-existing trunk version.  So bzrmerge just helps you
avoid those conflicts.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]