Rebase behaviour weird

[Russel Winder]

I have a branch that is from a Subversion repository and two branches
from that all in a shared repository.

All three branches have exactly the same change to a file under version
control but not committed.  So in all three branches:

|> bzr status
modified:
  gradle.properties
|>

In the Subversion repository mirror I can do "bzr rebase :parent" and I
get the desired behaviour, all the changes from the Subversion store get
pulled -- yes I know I can do pull but...  If I go to one of the other
two branches (both of which were taken from the mirror branch) I can do
"bzr rebase :parent" and the desired behaviour happens -- the changes
from the mirror branch are inserted under the changes in the branch.  In
the other branch however I get:

 |> bzr rebase :parent
bzr: ERROR: Working tree
"/home/users/russel/Repositories/Bazaar/Subversion_Branches/GradleCore_Trunk/TestNG/" has uncommitted changes.
|>

Clearly unexpected.  The only difference I can see between the two
branches is that the one that works as I want doesn't have a noted push
branch where the one that fails does.

So is it correct that the presence of a noted push branch should stop
rebase from working as desired.

Yes I know that failing is the way that Git works, but I think that is a
pain -- having to use stash/shelve in this situation is really
irritating.

-- 
Russel.
====================================================
Dr Russel Winder                 Partner

Concertant LLP                   t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road,              f: +44 8700 516 084
London SW11 1EN, UK.             m: +44 7770 465 077
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20081029/ec913573/attachment-0001.pgp