probably bug? update in lightweight checkout of heavyweight checkout turns local commits into pending merges

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Alexander Belchenko wrote:
> I don't know is it bug or feature, but I think it's the bug. At least
> this behavior
> was very undesirable for me.
> 
> I did heavyweight checkout from server, then I did lightweight checkout
> from heavyweight checkout.
> When I did local commit in heavyweight checkout and then update in
> lightweight one I get
> pending merges in lightweight checkout (???) and uncommit (!!!) in
> heavyweight checkout.
> 
> I think something wrong here. You may think different.
> 
> Here is sequence of steps to reproduce (I ran this in C:\Temp\1 directory):
> 

That sounds like expected behavior, though I'm not sure if you wanted
it. Specifically, you can get the same behavior without the extra checkout.

bzr checkout upstream checkout
cd checkout
bzr commit -m "local only" --local
bzr up

You now have pending merges in the heavy checkout because it updated to
the tip of the master branch.

That is by design, though there have been discussions if it is the
"correct" design.

The only difference in your workflow is that you added a second
lightweight checkout to the mix. But it doesn't really act any differently.

I understand that what you probably wanted to say was "update this
lightweight checkout to the tip of its branch, ignoring that the branch
is bound to a master." However, "bzr update" is defined as "update this
branch to the tip of its master (if exist), and update this working tree
to the tip of the branch afterwards."

We've talked about a few different ways of doing it, what is your
specific use case (why are you using a lightweight checkout of a heavy
checkout, etc.).

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFH3qYwJdeBCYSNAAMRAk2uAKCY4M0mObeuHlAjlXA4QHE/XVcZGgCg0klc
HcPDpdpN+RPpMO9RV0b8jXo=
=tPb5
-----END PGP SIGNATURE-----