out-of-date should print the bound-to branch location

[John Arbash Meinel]

I just had a semi-bogus problem with bound branches. It turns out that I
had a bound branch, but it wasn't bound where I thought it was. So when
I went to commit, I got the 'this branch is out of date', so I ran
update, and then it pulled in the wrong changes.
At that point, I'm pretty sure that update converted any extra revisions
in my tree into a merge, and then on top of that I had any manual
changes I had done.
In the end, I just went through the revert/clean-tree song and dance,
and started over again.

Basically my layout was:

~/dev/bzr/ftp-server # My working directory
~/bzr/branches/bzr/ftp-server # My public location
~/bzr/mirrors/bzr/abentley/ftp-server # A mirror of Aaron's version

I had done a checkout of Aaron's stuff, and then later did some sort of
revert/pull something so that it actually had my code, but was bound to
his branch.

Anyway, he had a couple of revisions where he merged in medusa, which we
decided not to do. In my branch, I had merged bzr.dev, which he hadn't done.

I had some uncommitted changes, and after doing 'bzr update', I'm pretty
sure it combined the merge with bzr.dev along with my working changes.

Probably simply printing the bound-to location would have helped me
realize the problem earlier. But there is another problem whereby my
current working changes are now getting combined with a previous merge.

I would probably say that 'bzr update' should do a pull if it can, but
if it would have to switch to a pull + merge, it should fail if there
are uncommitted changes.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060522/0981cb77/attachment.pgp