Comment 3 for bug 718723

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

On 2/15/2011 12:45 AM, David I wrote:
> Martin Pool wrote:
>> On 15 February 2011 00:19, David I <email address hidden> wrote:
>>
>>> Public bug reported:
>>>
>>> I'm getting a problem using bzr 2.3.0 with the sequence
>>>
>>> bzr branch --stacked <patch file>
>>> bzr merge <patch file>
>>>
>>> while the same sequence works if I leave out the --stacked.
>>>

you should be able to:

bzr branch --stacked $OTHER_BRANCH target
cd target
bzr pull --overwrite <patch_file>

The issue is that we cannot stack *on top* of a patch file, but only
another branch. I can agree that the UI should be cleaned up around this.

I don't remember 'bzr branch <patch file>' working before. I wonder if
it is actually finding the branch in the containing directory, and then
ignoreing 'patch-file'. So it is, effectively doing:

bzr branch --stacked . $TARGET

And possibly defaulting the name of the target to the base name of the
patch file? I don't really know.

John
=:->

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

iEYEARECAAYFAk1ammoACgkQJdeBCYSNAAMzBwCgwIPL15ugssQ/OBrPWNzWqppW
1mgAoNTYclPfDjsZkqW7CaJBaIos7bjf
=RBSG
-----END PGP SIGNATURE-----