← Back to team overview

vm team mailing list archive

[Repost] Warning about bzr rebase

 

Sorry if this is a duplicate - my pcrisis settings seem to be playing up and
not putting a From line in. Re-sending to ensure it gets out and into the
Archive correctly.

Tim

========================================================================
While I agree with Uday's points on using rebase, I wanted to flag that the
latest Ubuntu comes with bzr-rebase 0.5.5, which has a very nasty bug. See 

https://answers.launchpad.net/ubuntu/+source/bzr-rebase/+question/120478

"bzr-rebase version 0.5.5 suffers from a severe bug that makes it discard
silently all merge commits:
  https://bugs.launchpad.net/bzr-rewrite/+bug/266897

As a vital tool for developers working in large bzr projects, namely for
projects hosted on Launchpad, it would be very useful to upgrade the package to
0.6.0 at least, and avoid fellow developers the surprise of discovering this bug
the hard way."

It also seems that in the latest versions of bzr, the module is called
bzr-rewrite. 

So, it would seem that for those of us using Ubuntu, currently the only option
is to remove all the bzr packages and download the sources and build them
yourself! An additional hassle I'm really not happy about. It is probably also
a good idea to verify compatibility of versions between current prod version
and what launchpad runs. 

I might just suspend merges from the trunk into my branch and hope Ubuntu
updates their version of bzr for the next release, due at the end of October. 

I really do wish there was a git-bzr module like git-svn, which I use
frequently. All these bloody different version control systems are a pain to
keep on top of! I currently have 5 different systems I have to work with, all
just different enough to make life more frustrating than it needs to be.

While I prefer git, this is not a vote for switching. The overhead associated
with doing that is hard to justify and I find launchpad less irritating than
github. 

Tim

-- 
Tim Cross
tcross@xxxxxxxxxxxxxxx

There are two types of people in IT - those who do not manage what they 
understand and those who do not understand what they manage.