Bazaar

lp:~vila/bzr/375898-fix-root-more

Created by Vincent Ladeuil on 2010-04-01 and last modified on 2010-04-02
Get this branch:
bzr branch lp:~vila/bzr/375898-fix-root-more
Only Vincent Ladeuil can upload to this branch. If you are Vincent Ladeuil please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Vincent Ladeuil
Project:
Bazaar
Status:
Merged

Recent revisions

4750. By Vincent Ladeuil on 2010-04-02

Fix typo.

4749. By Vincent Ladeuil on 2010-04-02

Fixed as per John's review comments.

* bzrlib/merge.py:
(Merge3Merger.fix_root): Delete the useless (and bogus)
final_name() call, inline reparent_children and fix the comments.

4748. By Vincent Ladeuil on 2010-04-01

Add NEWS entry.

4747. By Vincent Ladeuil on 2010-04-01

Fix bug #3735898 by filtering out garbage paths.

* bzrlib/merge.py:
(Merge3Merger.fix_root): Call reparent_children when the other
root is not part of the tree.
(Merge3Merger.reparent_children): Don't adjust_path for files and
dirs that are not part of the final tree.

4746. By Vincent Ladeuil on 2010-04-01

Reproduce bug #373898.

* bzrlib/tests/per_workingtree/test_merge_from_branch.py:
(TestMergeFromBranch): Smallest test reproducing bug #373898, after an
independant branch has been merged, renaming a file from the imported
root and then deleteing it triggers the tree transform bug. Some more
tests to help ensure the fix will not regress on other cases.

4745. By Vincent Ladeuil on 2010-04-01

Fix imports.

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

(mbp) backup inherits .bzr permissions

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

(andrew) Move NEWS entry for #498409 to 2.0.6 section,
 it wasn't part of 2.0.5.

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

(andrew,
 for Danny van Heumen) 'bzr revert' no longer takes a branch lock (#498409)

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

(mbp) release 2.0.5

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:bzr
This branch contains Public information 
Everyone can see this information.

Subscribers