Rebase behaviour weird

[Jelmer Vernooij]

Hi Russel,

On Wed, 2008-10-29 at 11:48 +0000, Russel Winder wrote:
> 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.
rebase doesn't work with pending changes in the tree. pull does. Are you
sure this branch doesn't have any changes that would have to be rebased?

Cheers,

Jelmer

-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
Jabber: jelmer at jabber.fsfe.org