why does merge command sometimes not carry meta-data?
Christophe TROESTLER
Christophe.Troestler+bzr at umh.ac.be
Fri Jul 25 12:12:56 BST 2008
On Fri, 25 Jul 2008 16:52:58 +1000, Andrew Bennetts wrote:
>
> Andrew Straw wrote:
> > Hi, I'm a relative newcomer to bazaar, and I'm encountering some
> > behavior I don't understand. I have 2 branches for a project I'm working
> > on -- one which I share with others (my flydra-trunk branch), and one
> > which I keep my personal stuff layered on top (my flydra-ads branch).
> > The trouble I'm having is that when I merge from -ads into -trunk,
> > meta-data is lost. In other words, doing "bzr merge -r 1375..1378
> > ../flydra-ads" in flydra-trunk seems to apply just a plain diff patch.
> [...]
>
> Unfortuately, this is the expected behaviour. (...)
If all you are interested in is not merging your most recent revisions
(because, say, they are work in progress), just drop the first number
(e.g. do "bzr merge -r ..1378 ../flydra-ads") and the meta-data will
be carried. (Do not worry about previous revisions, they will not be
merged in twice!)
My 0.02€,
ChriS
More information about the bazaar
mailing list