resolve --take-other fails for ParentLoop conflicts in non-trivial cases

Bug #537956 reported by Vincent Ladeuil on 2010-03-12
This bug affects 1 person
Affects Status Importance Assigned to Milestone

Bug Description

The ParentLoop conflicts doesn't carry enough information for resolve --other.

The format string is also misleading as the paths are swapped.

The file_id and conflict_file_id attributes are correct but the path and conflict_path ones aren't.

I'll put up a branch with XFAIL tests and fixing the minor inconsistencies.

The cases not covered doesn't actually seem worth fixing so I'll propose to just record the known failures for now.

Roughly speaking, the real fix is to cancel the relevant action leading to 'this' and apply the relevant action leading to 'other'.

Since the conflict object carry only the infos related to the 'other' action this can't be done without
the missing informations related to 'this'.

Even at merge time (i.e. when the conflict object is created), identifying the relevant information may be non trivial
(the action may have occurred *before* the 'this' revision itself and be searched from the 'base' revision.

Vincent Ladeuil (vila) wrote :

The XFAIL tests have been added and the minor inconsistencies fixed.

Changed in bzr:
assignee: Vincent Ladeuil (vila) → nobody
status: In Progress → Confirmed
Jelmer Vernooij (jelmer) on 2017-11-09
tags: added: check-for-breezy
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers