[MERGE][bug 105479] Move children of a directory correctly

[John Arbash Meinel]

Martin Pool wrote:
> Martin Pool has voted +1.
> Status is now: Approved
> Comment:
> incidentally, _validate is getting a bit long and this new inner
> function might be better off as a top level method.
> 
> +            if parent_entry == (None, None):
> +                raise AssertionError(
> +                    "no parent entry for: %s in tree %s"
> +                    % (this_path, tree_index))
> +            else:
> +                if parent_entry[1][tree_index][0] != 'd':
> +                    raise AssertionError(
> +                        "Parent entry for %s is not marked as a valid"
> +                        " directory. %s" % (this_path, parent_entry,))
> +
> 
> Stylistically could remove the else as the raise will stop us getting here.

Done

> 
> This looks like a good additional test to have.
> 
> +        self.build_tree(['c/', 'c/b/', 'c/b/d/'])
> +        tree.add(['c', 'c/b', 'c/b/d'],
> +                 ['c-id', 'b-id', 'd-id'])
> 
> Incidentally we should factor out build_and_add_tree perhaps.

that could be nice.

> 
> It looks like a correct change, and the additional validation and tests
> are welcome so +1.
> 
> Regarding 0.15.1 - it is a pretty important fix, but as we'll do 0.16rc1
> on Monday maybe we should just ask people to upgrade to that instead.
> 
> For details, see:

Well, there are at least 3 bugs worthy of backporting:
https://bugs.launchpad.net/bzr/+bugs?field.searchtext=&orderby=-importance&field.status%3Alist=Unconfirmed&field.status%3Alist=Needs+Info&field.status%3Alist=Confirmed&field.status%3Alist=In+Progress&field.status%3Alist=Fix+Committed&field.status%3Alist=Fix+Released&assignee_option=any&field.assignee=&field.bug_reporter=&field.bug_contact=&field.omit_dupes.used=&field.omit_dupes=on&field.has_patch.used=&field.tag=backport&field.has_cve.used=&search=Search

Sorry that link is so horrible, but I needed to search by tags *and*
allow "Fix Released" to show up.


So far these are:
https://bugs.launchpad.net/bzr/+bug/105479
https://bugs.launchpad.net/bzr/+bug/104257
https://bugs.launchpad.net/bzr/+bug/107168

I thought there were more, but all of those could be considered regressions.

John
=:->