Implement actions take-this, take-other and done for resolve conflicts

Bug #696980 reported by Angel Guzman Maeso on 2011-01-03
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
QBzr
Medium
Unassigned

Bug Description

New versions of bazaar implement the actions:

bzr resolve recognizes the following actions:

--action=take-this will issue bzr mv FILE.THIS FILE,
--action=take-other will issue bzr mv FILE.OTHER FILE,
--action=done will just mark the conflict as resolved.

It would be a nice feature show on conflicts resolution a options on GUI for take THIS or OTHER file (mark as resolved already implemented)

The docs: http://doc.bazaar.canonical.com/latest/en/user-reference/conflict-types-help.html#content-conflicts

summary: - Implement actions take-this, take-other and donde for resolve conflicts
+ Implement actions take-this, take-other and done for resolve conflicts
Alexander Belchenko (bialix) wrote :

I'm sure bzr-explorer uses qconflicts dialog from QBzr, so this support should be implemented there.

affects: bzr-explorer → qbzr
Changed in qbzr:
importance: Undecided → Medium
status: New → Confirmed
tags: added: feature qconflicts treewidget
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers