"bzr rmbranch" doesn't handle colocated branches

[Jelmer Vernooij]

Reported by Aaron on the list:

On 12-01-23 10:12 AM, Jelmer Vernooij wrote:
>> It actually just seems to be in the 2.5 branch at the moment,
>> I'll up-merge that into bzr.dev as well.

With 2.5, it rmbranch appears to delete the wrong branch:

$ alias bzr=~/hacking/bzr/2.5/bzr
$ bzr init --development-colo foo
Created a standalone tree (format: development-colo)

$ cd foo
$ bzr branches
* (default)
$ bzr switch -b first-colo-branch
Tree is up to date at revision 0.

Switched to branch: /home/abentley/launchpad/foo/
$ bzr switch -b second-colo-branch
Tree is up to date at revision 0.

Switched to branch: /home/abentley/launchpad/foo/
$ bzr branches
  first-colo-branch
* second-colo-branch
$ bzr switch first-colo-branch
Tree is up to date at revision 0.
Switched to branch: /home/abentley/launchpad/foo/
$ bzr rmbranch second-colo-branch
$ bzr branches
  second-colo-branch

[Aaron Bentley (abentley)]

With bzr.dev revno 6460, rmbranch doesn't remove the branch, just the asterisk:

$ bzr branches
  first-colo-branch
* second-colo-branch
$ bzr switch first-colo-branch
Tree is up to date at revision 0.
Switched to branch: /home/abentley/sandbox/foo/
$ bzr rmbranch second-colo-branch
$ bzr branches
  first-colo-branch
  second-colo-branch

[Jelmer Vernooij (jelmer)]

On 02/02/2012 09:29 PM, Aaron Bentley wrote:
> With bzr.dev revno 6460, rmbranch doesn't remove the branch, just the
> asterisk:
>
> $ bzr branches
> first-colo-branch
> * second-colo-branch
> $ bzr switch first-colo-branch
> Tree is up to date at revision 0.
> Switched to branch: /home/abentley/sandbox/foo/
> $ bzr rmbranch second-colo-branch
> $ bzr branches
> first-colo-branch
> second-colo-branch
rmbranch calls "BzrDir.open_containing". That resolves to
$PWD/second-colo-branch. second-colo-branch isn't a branch, so $PWD is
opened. And then $PWD (.bzr/branch) gets removed, which is what causes
the asterisk to go away.

Cheers,

Jelmer

[Chris Halse Rogers (raof)]

Hello Jelmer, or anyone else affected,

Accepted bzr into precise-proposed. The package will build now and be available in a few hours. Please test and give feedback here. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Thank you in advance!

[Andrew Starr-Bochicchio (andrewsomething)]

I can confirm that the version in precise-proposed resolves this issue. Successful test case below:

andrew@andrew-laptop:~/Desktop$ bzr init --development-colo foo
Created a standalone tree (format: development-colo)
andrew@andrew-laptop:~/Desktop$ cd foo
andrew@andrew-laptop:~/Desktop/foo$ bzr branches
* (default)
andrew@andrew-laptop:~/Desktop/foo$ bzr switch -b first-colo-branch
Tree is up to date at revision 0.
Switched to branch: /home/andrew/Desktop/foo/
andrew@andrew-laptop:~/Desktop/foo$ bzr switch -b second-colo-branch
Tree is up to date at revision 0.
Switched to branch: /home/andrew/Desktop/foo/
andrew@andrew-laptop:~/Desktop/foo$ bzr branches
  first-colo-branch
* second-colo-branch
andrew@andrew-laptop:~/Desktop/foo$ bzr switch first-colo-branch
Tree is up to date at revision 0.
Switched to branch: /home/andrew/Desktop/foo/
andrew@andrew-laptop:~/Desktop/foo$ bzr rmbranch second-colo-branch
andrew@andrew-laptop:~/Desktop/foo$ bzr branches
* first-colo-branch

[Launchpad Janitor (janitor)]

This bug was fixed in the package bzr - 2.5.1-0ubuntu1

---------------
bzr (2.5.1-0ubuntu1) precise-proposed; urgency=low

  * New upstream release.
   + Fixes handling of colocated branches in `bzr rmbranch`. LP: #920653
   + rmbranch now refuses to remove active branch. LP: #922953
   + Connecting with HTTPS via HTTP correctly uses host name of destination
     rather than that of proxy. LP: #944696
   + No longer requires tty when GPG signing commits. LP: #847388
   + Fixes unicode erorrs when translated progress task messages
     contain non-ascii text. LP: #966934
   + Fixes display of help for configuration options that overlap
     with other topics. LP: #941672
  * Drop 06_spurious_test_failure: applied upstream.
 -- Jelmer Vernooij <email address hidden> Mon, 28 May 2012 13:36:02 +0200