bzr-2.3.2, SRU and conflicting tags

vila v.ladeuil+lp at free.fr
Thu May 12 21:12:40 UTC 2011


Hi guys,

I was cutting the 2.3.2 release and encountered an issue:

* I created the bzr-2.3.2 tag and submitted to pqm (lp:bzr/2.3) (yeah,
  for once I didn't run the test suite locally, shame on me !)

* I ran make check-dist-tarball | subunit2pyunit and got > 1000
  failures... Hello http://pad.lv/760435 ! Of course, pqm running py2.6
  happily ignored the problem (and of course this patch landed while I
  was in vacations and babune wasn't running so I never witnessed the
  bug nor realized the implications).

* I thought that the SRU won't be possible without a passing test suite
  (oops ?)

* I backported the fix and the test suite passed. The diff
  -rbzr-2.3.1..bzr-2.3.2 went from ~1200 lines to >3000 (oops for SRU ?)

* I did 'bzr tag bzr-2.3.2 --force' (oops ?)

And ended up with the infamous:

Conflicting tags:
    bzr-2.3.2

/me facepalms

So while I can 'bzr push --overwrite' to get rid of it, this won't
propagate to lp:bzr/2.3 (this is a use case that strongly ask for a
better way to handle tags, the RM himself can't fix the release tags ?
Come on...).

>From there I can:

1) Cut the release anyway *without* the backported diff and warn about
   the issue for the SRU

2) Fix my local tag and consider 2.3.2 dead and go with 2.3.3 instead.

3) Ask a losa or a super powered secret agent to 'push --overwrite
   lp:bzr/2.3'

Since I'm unclear about the consequences on the SRU process, I'm waiting
for your feedback :)

    Vincent



More information about the bazaar mailing list