lp:~bzr/bzr/375898-missing-merged-root

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

5120. By Vincent Ladeuil on 2010-03-29

Commit for jam.

5119. By Vincent Ladeuil on 2010-03-29

Reproduce bug #373898.

* bzrlib/tests/per_workingtree/test_merge_from_branch.py:
(TestMergeFromBranch.test_merge_type): Smallest test reproducing
bug #373898, after an independant branch has been merged, renaming
a file from the imported root and then deleted it triggers the
tree transform bug.

5118. By Canonical.com Patch Queue Manager <email address hidden> on 2010-03-26

(mbp) merge 2.1.1 back to trunk

5117. By Canonical.com Patch Queue Manager <email address hidden> on 2010-03-26

(andrew) Either correctly handle EINTR or don't handle it at all.
 (#496813)

5116. By Canonical.com Patch Queue Manager <email address hidden> on 2010-03-25

(jam) BTreeGraphIndex can now take an offset for the start-of-data.

5115. By Canonical.com Patch Queue Manager <email address hidden> on 2010-03-25

Copyright updates brought up by the bzr-update-copyright

5114. By Canonical.com Patch Queue Manager <email address hidden> on 2010-03-25

(vila) Add XFAIL tests for bug #537956

5113. By Canonical.com Patch Queue Manager <email address hidden> on 2010-03-25

(vila) Better PathConflict resolution when a deletion is involved

5112. By Canonical.com Patch Queue Manager <email address hidden> on 2010-03-25

(igc) Support python 2.6 in py2exe setup scripts

5111. By Canonical.com Patch Queue Manager <email address hidden> on 2010-03-25

(mbp) allow builtin commands to be lazy loaded; make bundle-info lazy