Merge lp:~jelmer/bzr-builddeb/709602-fix-duplicate-versions into lp:bzr-builddeb

[Jelmer Vernooij]

This makes 'bzr merge-upstream' error out if it's being used in merge mode and the version that's being merged is already present.

(No changelog entry as this is a bug in a feature that's not been released yet)

[Jelmer Vernooij (jelmer)]

Actually, looks like there was a similar bug open about non-merge-mode merging of old versions. changelog updated.

[James Westby (james-w)]

We might want force to override this? I can't think of a good reason for someone to do it right now though.

Thanks,

James

review: Approve

[Jelmer Vernooij (jelmer)]

On Mon, Jan 31, 2011 at 03:51:11PM -0000, James Westby wrote:
> Review: Approve
> We might want force to override this? I can't think of a good reason for someone to do it right now though.
Hmm, yeah. I wonder how that would work with merge - would we want to reset the
tree back to the old version? I guess we could wait until somebody files a wishlist
bug about this?

Cheers,

Jelmer

[James Westby (james-w)]

On Mon, 31 Jan 2011 18:48:59 -0000, Jelmer Vernooij <email address hidden> wrote:
> On Mon, Jan 31, 2011 at 03:51:11PM -0000, James Westby wrote:
> > Review: Approve
> > We might want force to override this? I can't think of a good reason for someone to do it right now though.
> Hmm, yeah. I wonder how that would work with merge - would we want to reset the
> tree back to the old version? I guess we could wait until somebody files a wishlist
> bug about this?

I don't see why not.

I think that --force is a good thing to have so that you don't get it
people's way, but only when you can make a sensible guess at what it
should do in that situation.

Thanks,

James

=== modified file 'cmds.py'
--- cmds.py	2011-01-29 02:51:40 +0000
+++ cmds.py	2011-01-30 23:40:50 +0000
@@ -708,9 +708,9 @@
                 if need_upstream_tarball:
                     location = primary_upstream_source.fetch_tarball(
                         package, version, target_dir)
-                note("Using version string %s." % (version))
             if version is None:
                 raise BzrCommandError("You must specify the version number using --version.")
+            note("Using version string %s." % (version))
             # Look up the revision id from the version string
             if upstream_revision is None and upstream_branch_source is not None:
                 upstream_revision = upstream_branch_source.version_as_revision(
@@ -722,6 +722,9 @@
                 conflicts = self._do_merge(tree, tarball_filename, version,
                     current_version, upstream_branch, upstream_revision,
                     merge_type, force)
+            if Version(current_version) >= Version(version):
+                raise BzrCommandError(
+                    "Upstream version %s has already been merged." % version)
             self._add_changelog_entry(tree, package, version,
                 distribution_name, changelog)
         finally: