better error when merging a bundle whose base is not present

[Martin Pool]

In bzr0.9 if you try to apply a bundle whose base is not present, you get "Revision %s not present in repository." This is technically correct but unhelpful; it would be better to say "Sorry, can't apply this bundle because the base revision %s is not present in repository".

(And perhaps we should try a fuzzy non-tracked application, along the lines of bzr patch?)

(Thanks to Matthieu Moy and Neilen Marais)

[Matthieu Moy (matthieu-moy)]

I'd add a message pointing to "pull" and "merge" which are usually the solution to the problem.

[Aaron Bentley (abentley)]

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

Matthieu Moy wrote:
> I'd add a message pointing to "pull" and "merge" which are usually the
> solution to the problem.

The problem is that we don't know what branch the user should pull from,
and they may think we are suggesting that we "pull" or "merge" the
bundle if we are too vague.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFE/OVc0F+nu1YWqI0RAm8jAKCCf2vwvYp/dC0yyxGHAEICdEQ6ugCggST4
zVbQfY9sslpGqQnMg5ywIS8=
=0TKA
-----END PGP SIGNATURE-----

[Alexander Belchenko (bialix)]

Low hanging fruit. Who want to pick it?

[Adrian Wilkins (adrian-wilkins)]

As an addendum ; it also needs a friendly message in the other direction ; when you are trying to merge from a bundle that does not contain the revision data for the revision(s) its patch encloses.

[Neil Martinsen-Burrell (nmb)]

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.