lp:~jameinel/bzr/2.4-dirstate-invalid-delta-855155
- Get this branch:
- bzr branch lp:~jameinel/bzr/2.4-dirstate-invalid-delta-855155
Branch merges
- bzr-core: Pending requested
-
Diff: 13 lines (+4/-0)1 file modifieddoc/en/release-notes/bzr-2.4.txt (+4/-0)
Related bugs
Bug #855155: InconsistentDelta error when using bzr update | High | Fix Released |
|
Related blueprints
Branch information
Recent revisions
- 6059. By John A Meinel
-
Add a direct Dirstate.
update_ basis_by_ delta test. Requires a slight tweak to the create_
tree_from_ shape code so that we
can set the exact revision_id for an entry (so a dir doesn't look changed
when it shouldn't). - 6058. By Brian de Alwis
-
Backport the fix for bug #855155 to bzr-2.4
Dirstate.
update_ basis_by_ delta had a logic flaw where if it got a delta that added files to
an otherwise empty directory, it would notice that the dirblock didn't exist,
and it would claim the delta was invalid, rather than noticing the parent
directory did exist, it just had an empty (thus nonexistent) block.
This never triggered in commit, because you always have the files in 'current'
which forces the block to exist. But things like uncommit can change the basis
without touching current. - 6056. By Patch Queue Manager <email address hidden>
-
(gz) Accept new style testtools output in bt.test_selftest tests (Martin
Packman) - 6055. By Patch Queue Manager <email address hidden>
-
(mbp) improvements and corrections to mini-tutorial (Martin Pool)
- 6054. By Patch Queue Manager <email address hidden>
-
(mbp) Correction to 'bzr serve' syntax in admin guide (thanks i41) (Martin
Pool) - 6053. By Patch Queue Manager <email address hidden>
-
(gz) Fix random test failure due to race in
test_server_crash_while_ responding (Vincent Ladeuil) - 6052. By Patch Queue Manager <email address hidden>
-
(gz) Fix compatibility with Cython 0.15 or later and development versions
(Martin Packman)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:bzr