bzr up -r and bzr up-thread incompatibility

[Barry Warsaw]

This may be a bzr-looms bug instead, but I found it when doing a UDD task, so starting to report it here.

I created a packaging branch of gtimelog like so:

bzr branch lp:gtimelog trunk
bzr branch trunk packaging
cd packaging
bzr loomify --base trunk
bzr create-thread packaging
(add debian/ and other hacking)
bzr commit
bzr record
bzr bd -S

Now I get lintian errors because my diff.gz contains changes from outside the debian/ directory. The ultimate reason for this is that I originally branched the trunk head, which had moved slightly from the 0.4.0 tag. Specifically, the NEWS.txt file and __init__.py had been updated for post release placeholders (e.g. version bumped to 0.4.0dev).

What I really wanted to do was branch -r tag:0.4.0 from the trunk. No worries, I think I can fix that...

bzr down-thread trunk
bzr up -r tag:0.4.0
bzr up-thread --auto

Unfortunately this step fails because bzr is telling me that my branch is not up-to-date. I don't see any way to fix this after the fact. Note however that by starting out correctly, everything is happy. E.g. substitute for the branch off trunk with

bzr branch -r tag:0.4.0 trunk packaging

Now I can create the packaging thread and everything works perfectly; no complaints from lintian either.

There should be a way to fix the first example after the fact. Also, it should be possible to migrate the trunk to a new tag when a new release is made to inherit all the existing packaging. Haven't tested that though.

[Martin Pool (mbp)]

I realize it's reproducible, but could you please paste the traceback from ~/.bzr.log* if you still have it, to speed analysis? Thanks.