[REGRESSION] bzr 2.1 @ windows: bzr eats double backslashes in the command line
John Arbash Meinel
john at arbash-meinel.com
Tue Mar 30 00:50:06 BST 2010
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Martin Pool wrote:
> On 30 March 2010 09:50, Gordon Tyler <gordon at doxxx.net> wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> On 3/29/2010 9:43 AM, Gordon Tyler wrote:
>>> On 29/03/2010 3:47 AM, Alexander Belchenko wrote:
>>>> The bug https://bugs.launchpad.net/bzr/+bug/528944 is very serious
>>>> regression and I've supposed it will be fixed in 2.1. Apparently it's
>>>> not. There is one more bug report about this problem.
>>>>
>>>> Gordon, what are your plans on the backport of the fix?
>>> I believe the plan was to wait and see if any problems cropped up in
>>> bzr.dev with my new cmdline parser implementation. I haven't heard of
>>> anything yet. I guess we'll have to try get this into bzr 2.1.2?
>> I was looking at cherry-picking the change from bzr.dev into a branch of
>> 2.1 but I'm getting spurious extra changes. The command I used was:
>>
>> bzr merge -c 5046 --weave ../bzr.dev
>>
>> Revision 5046 is where mbp merged my changes in.
>>
>> Am I doing something wrong? Should I just create a patch from that
>> revision and apply it to my 2.1 branch?
>
> That revision seems, on brief inspection, to have only cmdline-related changes.
>
> I would try the merge without --weave.
>
I don't think cherrypicking and --weave merge are particularly well
defined. I'm pretty sure that the code has support for it, but I would
guess we didn't really think through the edge cases, etc.
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAkuxPK0ACgkQJdeBCYSNAAPkWQCgu4AJ6OuK+6b2sXYfxjhXewuz
paEAn26C8+68dlVPe8rFIvyeiezqh95l
=XOuV
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list