Breezy

Merge lp:~jelmer/brz/3.2-fix-kind-change into lp:brz/3.2

  1. 3.2-fix-kind-change
  2. Merge into 3.2
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/3.2-fix-kind-change
Merge into: lp:brz/3.2
Diff against target: 12 lines (+1/-1)
1 file modified
breezy/plugins/fastimport/exporter.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/3.2-fix-kind-change
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+412727@code.launchpad.net

Commit message

Fix path reference in kind change.

Description of the change

Fix path reference in kind change.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/plugins/fastimport/exporter.py'
2--- breezy/plugins/fastimport/exporter.py 2020-07-18 23:14:00 +0000
3+++ breezy/plugins/fastimport/exporter.py 2021-12-03 01:38:57 +0000
4@@ -504,7 +504,7 @@
5 # Map kind changes to a delete followed by an add
6 for change in changes.kind_changed:
7 path = self._adjust_path_for_renames(
8- path, renamed, tree_new.get_revision_id())
9+ change.path[0], renamed, tree_new.get_revision_id())
10 # IGC: I don't understand why a delete is needed here.
11 # In fact, it seems harmful? If you uncomment this line,
12 # please file a bug explaining why you needed to.

Subscribers

People subscribed via source and target branches