Comment 5 for bug 494269

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

James Westby wrote:
> On Wed Dec 09 17:55:42 UTC 2009 John A Meinel wrote:
>> Perhaps 'merge-package' is doing something fancier which is causing the
>> breakage?
>
> Yes, it is. It's still just merging revisions of the two branches together,
> but in a different manner.
>
> You can do the steps yourself with (starting in the Ubuntu branch):
>
> bzr push ../upstream -r tag:upstream-2.6.22
> cd ../upstream
> bzr merge lp:debian/smarty -r tag:upstream-2.6.26
> bzr revert -r branch:lp:debian/smarty
> bzr ci -m "merge upstreams"
> cd ../smarty
> bzr merge ../upstream
> Doing this shows something odd, the first push gives an unclean
> status:
>

I don't understand how push can give an unclean status. If the tree was
clean before the push, the push should create a direct update that
leaves the tree clean afterwards.

Then again, we certainly may have a bug, especially if it involves
changing the tree root id.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAksij+AACgkQJdeBCYSNAAPJzwCdF00WvL1DAb3kNtoObbY62OVS
wrkAoIZs5MZ6p4agpZ/rYBSaUCvEmY/V
=oG6f
-----END PGP SIGNATURE-----