Comment 5 for bug 58840

Revision history for this message
Neil Martinsen-Burrell (nmb) wrote :

I can't reproduce this. I get "Performing cherrypick" when I try to merge a bundle based on a revision that doesn't exist. Such as:

$ bzr init /tmp/test
Created a standalone tree (format: pack-0.92)
$ cd /tmp/test
$ touch a && bzr add
adding a
$ bzr ci -m 'first'
Committing to: /private/tmp/test/
added a
Committed revision 1.
$ cd ..
$ bzr branch test test_new
Branched 1 revision(s).
$ cd test_new
$ touch b
$ bzr add
adding b
$ bzr ci -m 'second'
Committing to: /private/tmp/test_new/
added b
Committed revision 2.
$ cd ..
$ bzr branch test_new test_three
Branched 2 revision(s).
$ cd test_three
$ touch c
$ bzr add
adding c
$ bzr ci -m 'third for merging'
Committing to: /private/tmp/test_three/
added c
Committed revision 3.
$ bzr send -o ../test.patch
Using saved parent location "file:///private/tmp/test_new/" to determine what changes to submit.
Bundling 1 revision(s).
$ cd ../test
$ bzr merge ../test.patch
Performing cherrypick
+N c
All changes applied successfully.