[Pkg-bazaar-maint] Bug#493386: merge-upstream should support merging from upstream in a branch

[Jelmer Vernooij]

Package: bzr-builddeb
Version: 0.95
Severity: wishlist

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

It would be very useful if "bzr merge-upstream" supported merging from a
Bazaar branch. It could just do a "bzr merge" in that situation.

When merging from a bzr branch, it should also be possible to
automatically determine the upstream version string by looking at the
tags in the upstream branch:

 * If a tag is set on the last revision, use that tag's name as version
   string.
 * If no tag is set on the upstream revision, find the latest existing
   tag in the branch and append +bzr<revno> to it (or +svn<svn-revno>,
   if it is a Subversion branch).

I'll see if I can implement this.

- -- System Information:
Debian Release: lenny/sid
  APT prefers gutsy
  APT policy: (500, 'gutsy'), (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.25-2-686 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages bzr-builddeb depends on:
ii  bzr                           1.5-2      easy to use distributed version co
ii  bzrtools                      1.5.0-1    Collection of tools for bzr
ii  devscripts                    2.10.35    scripts to make the life of a Debi
ii  dpkg-dev                      1.14.20    Debian package development tools
ii  fakeroot                      1.9.5      Gives a fake root environment
ii  patchutils                    0.2.31-4   Utilities to work with patches
ii  python                        2.5.2-2    An interactive high-level object-o
ii  python-apt                    0.7.7.1    Python interface to libapt-pkg
ii  python-central                0.6.8      register and build utility for Pyt
ii  python-debian                 0.1.10     Python modules to work with Debian

bzr-builddeb recommends no packages.

Versions of packages bzr-builddeb suggests:
ii  bzr-svn                       0.4.10-2   Bazaar plugin providing Subversion

- -- no debconf information

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iJwEAQECAAYFAkiUf54ACgkQDLQl4QYPZuV4QgP/XCAVcZzK6yQ/hANonnVc/mMp
6hF5jvQRzNUB+WM1kR92AQlEorkaH3sgS+SJ+heswILUtcbFCaqA6km9B8GU3B7H
N2KuqkbY9aw/7S6wcDv8FYWh5QXxI/qJ2CQVOQ9cpT/0LEfshaDwo23kckhp4kSZ
lwQaoMDBlOBko3peqN8=
=ID65
-----END PGP SIGNATURE-----