default merge source is confusing (docs mismatch behaviour, behaviour is complex)

Bug #598332 reported by Robert Collins
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar
Confirmed
Medium
Unassigned

Bug Description

bzr merge --help claims it merges from the parent, or a --remembered url; the actual behaviour seems to be from submit, then parent. Or something - i haven't checked the code.

I know this has changed recently, and flopped around a bit; it would be good to find some basic primitive to build all this stuff out of that would be less confusing - particularly as submit branches seem to be somewhat fading *anyway* with the stronger focus on API usage and explicit metadata in plugins to meet individual workflows.

Martin Pool (mbp)
tags: added: confusing-ui merge
summary: - bzr merge is horribly confusing about where it will merge from
+ default merge source is confusing
Changed in bzr:
status: New → Confirmed
importance: Undecided → Medium
summary: - default merge source is confusing
+ default merge source is confusing (docs mismatch behaviour, behaviour is
+ complex)
Jelmer Vernooij (jelmer)
tags: added: check-for-breezy
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.