Merge lp:~jelmer/brz/merge-lca-regression into lp:brz

Proposed by Jelmer Vernooij on 2018-03-24
Status: Merged
Approved by: Jelmer Vernooij on 2018-03-24
Approved revision: 6924
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/merge-lca-regression
Merge into: lp:brz
Diff against target: 25 lines (+5/-3)
1 file modified
breezy/merge.py (+5/-3)
To merge this branch: bzr merge lp:~jelmer/brz/merge-lca-regression
Reviewer Review Type Date Requested Status
Martin Packman 2018-03-24 Approve on 2018-03-24
Review via email: mp+342049@code.launchpad.net

Commit message

Fix regression dealing with LCA merges.

Description of the change

Fix regression dealing with LCA merges.

paths is set to ((base_path, [lca_path1, lca_path2, ...], this_path, other_path),
whereas _dump_conflicts() takes a 3-tuple of paths.

To post a comment you must log in.
Martin Packman (gz) wrote :

Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'breezy/merge.py'
--- breezy/merge.py 2018-03-24 11:21:54 +0000
+++ breezy/merge.py 2018-03-24 18:33:38 +0000
@@ -1356,8 +1356,9 @@
1356 self.tt.unversion_file(trans_id)1356 self.tt.unversion_file(trans_id)
1357 # This is a contents conflict, because none of the available1357 # This is a contents conflict, because none of the available
1358 # functions could merge it.1358 # functions could merge it.
1359 file_group = self._dump_conflicts(name, paths, parent_id, file_id,1359 file_group = self._dump_conflicts(
1360 set_version=True)1360 name, (base_path, other_path, this_path), parent_id,
1361 file_id, set_version=True)
1361 self._raw_conflicts.append(('contents conflict', file_group))1362 self._raw_conflicts.append(('contents conflict', file_group))
1362 elif hook_status == 'success':1363 elif hook_status == 'success':
1363 self.tt.create_file(lines, trans_id)1364 self.tt.create_file(lines, trans_id)
@@ -1368,7 +1369,8 @@
1368 self._raw_conflicts.append(('text conflict', trans_id))1369 self._raw_conflicts.append(('text conflict', trans_id))
1369 name = self.tt.final_name(trans_id)1370 name = self.tt.final_name(trans_id)
1370 parent_id = self.tt.final_parent(trans_id)1371 parent_id = self.tt.final_parent(trans_id)
1371 self._dump_conflicts(name, paths, parent_id, file_id)1372 self._dump_conflicts(
1373 name, (base_path, other_path, this_path), parent_id, file_id)
1372 elif hook_status == 'delete':1374 elif hook_status == 'delete':
1373 self.tt.unversion_file(trans_id)1375 self.tt.unversion_file(trans_id)
1374 result = "deleted"1376 result = "deleted"

Subscribers

People subscribed via source and target branches