lp:~jameinel/bzr/2.4-dirstate-invalid-delta-855155

Branch merges

Propose for merging

Merged into lp:bzr/2.4 at revision 6078

bzr-core: Pending requested 2013-05-29

Diff: 13 lines (+4/-0)

1 file modified

doc/en/release-notes/bzr-2.4.txt (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #855155: InconsistentDelta error when using bzr update

High

Fix Released

Link a bug report

Related blueprints

6061. By John A Meinel on 2013-05-29

Remember to update release notes when submitting these things.

6060. By John A Meinel on 2013-05-29

Clean things up a bit.

6059. By John A Meinel on 2013-05-29

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 on 2013-05-28

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.

6057. By Vincent Ladeuil on 2011-10-27

Release 2.4.2

6056. By Patch Queue Manager <email address hidden> on 2011-10-26

(gz) Accept new style testtools output in bt.test_selftest tests (Martin
 Packman)

6055. By Patch Queue Manager <email address hidden> on 2011-10-18

(mbp) improvements and corrections to mini-tutorial (Martin Pool)

6054. By Patch Queue Manager <email address hidden> on 2011-10-14

(mbp) Correction to 'bzr serve' syntax in admin guide (thanks i41) (Martin
 Pool)

6053. By Patch Queue Manager <email address hidden> on 2011-10-10

(gz) Fix random test failure due to race in
 test_server_crash_while_responding (Vincent Ladeuil)

6052. By Patch Queue Manager <email address hidden> on 2011-10-06

(gz) Fix compatibility with Cython 0.15 or later and development versions
 (Martin Packman)