[Pkg-bazaar-maint] Bug#520302: bzr-rebase: Can't rebase a bound branch

[Roland Mas]

Package: bzr-rebase
Version: 0.4.4-1
Severity: normal

It seems one can't rebase a branch when it's bound.  Unbinding allows
the rebase, but then one has to push --overwrite to propagate the
changes to the "master" branch.  Sample session:

,----
| guest at mirexpress:~$ mkdir trunk
| guest at mirexpress:~$ cd trunk/
| guest at mirexpress:~/trunk$ bzr init
| Created a standalone tree (format: pack-0.92)                                                                                                          
| guest at mirexpress:~/trunk$ date > foo
| guest at mirexpress:~/trunk$ bzr add
| adding foo
| guest at mirexpress:~/trunk$ bzr commit -mfoo
| Committing to: /home/guest/trunk/                                                                                                                      
| added foo
| Committed revision 1.                                                                                                                                  
| guest at mirexpress:~/trunk$ cd ../
| guest at mirexpress:~$ bzr branch trunk/ branch-master
| Branched 1 revision(s).                                                                                                                                
| guest at mirexpress:~$ bzr checkout branch-master/ branch-checkout
| guest at mirexpress:~$ cd branch-checkout                                                                                                                 
| guest at mirexpress:~/branch-checkout$ date > bar
| guest at mirexpress:~/branch-checkout$ bzr add
| adding bar
| guest at mirexpress:~/branch-checkout$ bzr commit -mbar
| Committing to: /home/guest/branch-master/                                                                                                              
| added bar
| Committed revision 2.                                                                                                                                  
| guest at mirexpress:~/branch-checkout$ cd ../trunk/
| guest at mirexpress:~/trunk$ date > baz
| guest at mirexpress:~/trunk$ bzr add
| adding baz
| guest at mirexpress:~/trunk$ bzr commit -mbaz
| Committing to: /home/guest/trunk/                                                                                                                      
| added baz
| Committed revision 2.                                                                                                                                  
| guest at mirexpress:~/trunk$ cd ../branch-checkout/
| guest at mirexpress:~/branch-checkout$ bzr missing --line ../trunk/
| You have 1 extra revision(s):
| 2: Invité 2009-03-18 bar
| 
| 
| 
| You are missing 1 revision(s):
| 2: Invité 2009-03-18 baz
| guest at mirexpress:~/branch-checkout$ bzr rebase ../trunk/
| All changes applied successfully.                                                                                                                      
| /usr/lib/python2.5/site-packages/bzrlib/plugins/rebase/rebase.py:397: DeprecationWarning: bzrlib.revision.Revision.get_apparent_author was deprecated in version 1.13.
|   author = oldrev.get_apparent_author()
| bzr: ERROR: Bound branch BzrBranch6('file:///home/guest/branch-checkout/') is out of date with master branch BzrBranch6('file:///home/guest/branch-master/').
| guest at mirexpress:~/branch-checkout$ bzr rebase-abort
| guest at mirexpress:~/branch-checkout$ bzr unbind                                                                                                         
| guest at mirexpress:~/branch-checkout$ bzr rebase ../trunk/
| All changes applied successfully.                                                                                                                      
| /usr/lib/python2.5/site-packages/bzrlib/plugins/rebase/rebase.py:397: DeprecationWarning: bzrlib.revision.Revision.get_apparent_author was deprecated in version 1.13.
|   author = oldrev.get_apparent_author()
| Committing to: /home/guest/branch-checkout/
| added bar
| Committed revision 3.                                                                                                                                  
| guest at mirexpress:~/branch-checkout$ 
`----

  I'm pretty sure I used to rebase bound branches in a not too distant
past (before the latest batch of uploads to sid).

Roland.
-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.28-1-686 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages bzr-rebase depends on:
ii  bzr                           1.13~rc1-1 easy to use distributed version co
ii  python                        2.5.4-2    An interactive high-level object-o
ii  python-central                0.6.11     register and build utility for Pyt

bzr-rebase recommends no packages.

bzr-rebase suggests no packages.

-- no debconf information

-- 
Roland Mas

When you have a hammer in your hand, most things look like a nail.