Created by John A Meinel and last modified
Get this branch:
bzr branch lp:~jameinel/bzr/2.4-dirstate-invalid-delta-855155
Only John A Meinel can upload to this branch. If you are John A Meinel please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

John A Meinel

Recent revisions

6061. By John A Meinel

Remember to update release notes when submitting these things.

6060. By John A Meinel

Clean things up a bit.

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.

6057. By Vincent Ladeuil

Release 2.4.2

6056. By Patch Queue Manager <email address hidden>

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

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

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:
This branch contains Public information 
Everyone can see this information.