pull and update should accept --show-base

Bug #202374 reported by Stefan Monnier
4
Affects Status Importance Assigned to Milestone
Bazaar
Fix Released
Medium
Rory Yorke

Bug Description

The merges that take place only in the working directory should also support 3-way conflict markers, as used by the --show-base argument in "merge".
I'd even go as far as to say that --show-base should always be the default (when possible) because it provides much better information, which is important to be able to resolve conflicts efficiently and safely.

Tags: easy merge

Related branches

Revision history for this message
Stefan Monnier (monnier) wrote :

Any news on this?

Revision history for this message
Wouter van Heyst (larstiq) wrote :

The title in combination with the body confuse me, could you explain in more detail what it is you think should be done?

Changed in bzr:
status: New → Incomplete
Revision history for this message
Stefan Monnier (monnier) wrote :

I don't know what more you want to know. Currently "update" and "pull" do a 3-way merge and represent the remaining conflicts with 2-way conflict markers. This should be changed to use 3-way conflict markers instead, either by default or via a "--show-base" argument.

Revision history for this message
Martin Pool (mbp) wrote :

I agree, that would be pretty nice. @wouter I think the description is clear too.

This should be fairly easy if someone wants to tackle it, just by copying the appropriate option setting from merge.

Changed in bzr:
importance: Undecided → Medium
status: Incomplete → Confirmed
tags: added: easy merge
Rory Yorke (ryorke)
Changed in bzr:
status: Confirmed → In Progress
assignee: nobody → Rory Yorke (ryorke)
Vincent Ladeuil (vila)
Changed in bzr:
milestone: none → 2.3b2
status: In Progress → Fix Released
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.