mv --auto does not handle directory adds mixed with the contents of a directory splitting in two: InconsistentDelta error
Bug #373319 reported by
Frits Jalvingh
This bug affects 13 people
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
High
|
mnn | ||
Breezy |
Fix Released
|
Medium
|
Jelmer Vernooij |
Bug Description
#!/bin/bash
rm -rf testrepo
bzr init testrepo
cd testrepo
mkdir a
echo 1 > a/file1.java
echo 2 > a/file2.java
echo 3 > a/file3.java
bzr add
bzr commit -m "Initial commit"
mkdir c
mv a/file1.java c/file1new.java
mv a/file2.java a/file2new.java
mv a/file3.java a/file3new.java
echo "-------- moving ---------------"
bzr mv --auto
...
a => c
a/file1.java => c/file1new.java
a/file2.java => a/file2new.java
a/file3.java => a/file3new.java
bzr: ERROR: An inconsistent delta was supplied involving u'a', 'a-id-1'
reason: This parent is not present.
Related branches
lp:~mnn282/bzr/auto-rename-fix
- Martin Packman (community): Approve
- bzr-core: Pending requested
-
Diff: 51 lines (+25/-1)2 files modifiedbzrlib/rename_map.py (+8/-1)
bzrlib/tests/test_rename_map.py (+17/-0)
lp:~jelmer/brz/auto-rename-fix
- Martin Packman: Approve
-
Diff: 3847 lines (+708/-763)48 files modifiedbreezy/rename_map.py (+8/-1)
breezy/tests/test_groupcompress.py (+271/-292)
breezy/tests/test_rename_map.py (+15/-0)
doc/developers/HACKING.txt (+63/-109)
doc/developers/branding.txt (+14/-0)
doc/developers/bug-handling.txt (+38/-39)
doc/developers/case-insensitive-file-systems.txt (+1/-1)
doc/developers/check.txt (+1/-1)
doc/developers/code-review.txt (+7/-7)
doc/developers/code-style.txt (+17/-17)
doc/developers/colocated-branches.txt (+26/-26)
doc/developers/config-rationale.txt (+7/-7)
doc/developers/content-filtering.txt (+3/-3)
doc/developers/contribution-quickstart.txt (+2/-2)
doc/developers/cycle.txt (+9/-10)
doc/developers/development-repo.txt (+7/-7)
doc/developers/documenting-changes.txt (+4/-4)
doc/developers/ec2.txt (+4/-4)
doc/developers/implementation-notes.txt (+1/-1)
doc/developers/index-plain.txt (+22/-25)
doc/developers/index.txt (+6/-7)
doc/developers/indices.txt (+3/-3)
doc/developers/integration.txt (+25/-25)
doc/developers/inventory.txt (+6/-6)
doc/developers/last-modified.txt (+1/-1)
doc/developers/lca_tree_merging.txt (+1/-1)
doc/developers/network-protocol.txt (+1/-1)
doc/developers/overview.txt (+12/-12)
doc/developers/packrepo.txt (+3/-3)
doc/developers/plans/index.txt (+0/-2)
doc/developers/plans/performance/commit.txt (+5/-5)
doc/developers/plans/performance/directory-fingerprints.txt (+1/-1)
doc/developers/plans/performance/incremental-push-pull.txt (+1/-1)
doc/developers/plans/performance/roadmap.txt (+1/-1)
doc/developers/plugin-api.txt (+46/-46)
doc/developers/ppa.txt (+6/-6)
doc/developers/principles.txt (+9/-9)
doc/developers/profiling.txt (+4/-4)
doc/developers/releasing.txt (+13/-13)
doc/developers/repository-stream.txt (+1/-1)
doc/developers/repository.txt (+3/-3)
doc/developers/revision-properties.txt (+2/-2)
doc/developers/specifications.txt (+7/-2)
doc/developers/transports.txt (+12/-12)
doc/developers/ui.txt (+15/-15)
doc/developers/win32_build_setup.txt (+1/-1)
doc/developers/xdg_config_spec.txt (+0/-24)
doc/en/release-notes/brz-3.0.txt (+3/-0)
tags: | added: dirstate |
Changed in bzr: | |
status: | Incomplete → Confirmed |
summary: |
- dirstate AssertionError: "Could not find target parent in wt" after - auto mv/rename or deleting directory + mv --auto does not handle directory adds mixed with the contents of a + directory splitting in two: InconsistentDelta error |
tags: | removed: dirstate |
description: | updated |
tags: | added: case-sensitivity |
tags: | added: mv |
tags: | added: check-for-breezy |
Changed in brz: | |
status: | New → Triaged |
importance: | Undecided → Medium |
Changed in brz: | |
assignee: | nobody → Jelmer Vernooij (jelmer) |
status: | Triaged → In Progress |
Changed in brz: | |
status: | In Progress → Fix Released |
milestone: | none → 3.0.0 |
tags: | removed: check-for-breezy |
To post a comment you must log in.
This is a similar traceback to and may represent a regression of bug 150438.