[11:29] <Noldorin> hi jelmer
[11:29] <Noldorin> (and other folks)
[11:29] <nyuszika7h> Mkaysi said that User is broken
[11:29] <nyuszika7h> Sorry, wrong tab.
[11:30] <nyuszika7h> Autoattach...
[17:35] <iamfuzztoo> hello all, trying to use merge-upstream with an existing branch that contains the upstream code + debian/
[17:35] <iamfuzztoo> so I created the upstream-1.7 tag per here:  http://daniel.holba.ch/temp/guide/udd-merging.html
[17:36] <iamfuzztoo> but when i try to do the merge-upstream command, i get:
[17:36] <iamfuzztoo> bzr: ERROR: Upstream version "1.7" has already been imported.
[17:36] <iamfuzztoo> is there a way to merge in an upstream tarball on an existing branch?
[17:36]  * iamfuzztoo is new to the UDD way of doing things
[17:45] <maxb> You can do a plain old 'bzr merge -r upstream-1.7'
[17:45] <maxb> Or, you can use 'bzr merge-package' with some arguments I don't know off hand
[17:46] <maxb> The difference is that merge-package invokes various special workarounds for avoiding spurious conflicts when merging histories which have imported different upstream versions, or multiple copies of an upstream version.
[17:56] <iamfuzztoo> maxb, thanks, I'll tinker around
[18:44] <croepha> is there a way to pull a bunch of branches together, without making extra commit
[19:10] <Noldorin> wgz, hey there.