Merge lp:~jelmer/bzr-builddeb/revison-logic into lp:bzr-builddeb

[Jelmer Vernooij]

This fixes the logic that errors out when --revision is specified and a tarball is being merged.

[Robert Collins (lifeless)]

On Mon, May 24, 2010 at 3:00 AM, Jelmer Vernooij <email address hidden> wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr-builddeb/revison-logic into lp:bzr-builddeb.
>
> Requested reviews:
>  Bzr-builddeb-hackers (bzr-builddeb-hackers)
>
>
> This fixes the logic that errors out when --revision is specified and a tarball is being merged.

Do we want to error out? Or does this not apply when there is a
tarball *and* a branch?

-Rob

[Jelmer Vernooij (jelmer)]

The logic in the check was incorrect. We do want to error out if there was a tarball specified (since the --revision doesn't make any sense then).

[Robert Collins (lifeless)]

Why doesn't it make sense?

[James Westby (james-w)]

On Mon, 24 May 2010 02:43:22 -0000, Robert Collins <email address hidden> wrote:
> Why doesn't it make sense?

The error message was badly worded, the check only kicks in if there is
no branch, but the logic was indeed inverted.

Thanks,

James

=== modified file 'cmds.py'
--- cmds.py	2010-05-06 14:30:28 +0000
+++ cmds.py	2010-05-23 15:00:46 +0000
@@ -561,7 +561,7 @@
                 else:
                     upstream_revision = upstream_branch.last_revision()
 
-            if no_tarball and revision is not None:
+            if not no_tarball and revision is not None:
                 raise BzrCommandError("--revision is not allowed when merging a tarball")
 
             if version is None: