Comment 6 for bug 307662

Revision history for this message
Christian Hudon (chrish) wrote :

I've been reading stuff like the following a few times on the bazaar mailing-list:

----

From: Martin Pool <mbp <at> sourcefrog.net>
Subject: Re: Is "bzr push" safe?
Newsgroups: gmane.comp.version-control.bazaar-ng.general
Date: 2011-11-30 00:13:29 GMT (8 weeks, 2 days, 20 hours and 13 minutes ago)

Hi Patrick,

What this is referring to is that pushing a per-task (eg per-bug)
branch over the mainstream branch will cause a change to the mainline
of trunk. No data is lost, but the graph of revisions will be
presented differently and this may be disturbing.

You can set append_revisions_only to avoid this happening and we
probably should make that option the default.

----

(At http://article.gmane.org/gmane.comp.version-control.bazaar-ng.general/73395)

I also agree that the current behavior of bazaar where the mainline changes silently if you don't pay attention about the direction you do your merges (or are not aware that said merge direction is important) is confusing. I thought I'd come here and create a bug to prod things along about changing the default, but such a bug already exists. So I'm adding this here instead.