> 15 +* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the
> same
>
> Sorts before:
>
> 9 * ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~``
> instead
>
> that should address the conflict.
>
Fixed. I merged the trunk and resolved this.
> 45 +class _PosixPermissionsFeature(Feature):
>
> I think we put new features into bzrlib.test.features instead.
>
> 88 + import os, stat
>
> Generally, for tests, we put imports at the top of the file.
>
> 109 + stat = self.stat(from_relpath)
> 110 + target.mkdir('.', stat.st_mode & 0777)
>
> A comment would not hurt :)
> 15 +* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the
> same
>
> Sorts before:
>
> 9 * ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~``
> instead
>
> that should address the conflict.
>
Fixed. I merged the trunk and resolved this.
> 45 +class _PosixPermissio nsFeature( Feature) : test.features instead. from_relpath)
>
> I think we put new features into bzrlib.
>
> 88 + import os, stat
>
> Generally, for tests, we put imports at the top of the file.
>
> 109 + stat = self.stat(
> 110 + target.mkdir('.', stat.st_mode & 0777)
>
> A comment would not hurt :)
Done.
Thanks for the review comments Vincent.