Weird failure of a merge to local branch

[Aaron Bentley]

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

On 12/07/2010 01:39 PM, Eli Zaretskii wrote:
> Sorry, I spoke too soon, because after doing the above and resolving
> the 4 text conflicts, "bzr status" still says that working tree is out
> of date and suggest to run "bzr update".

I can't think of how a merge could cause the tree to get out of date.
Merges don't commit or anything.  Perhaps this was caused by one of the
steps you took when trying to fix this issue?

> It also shows a pending
> merge tip.  I think it means that this branch diverged from its
> parent, which is not what I want (this branch is supposed to be a
> perfect replica of its parent, because I always merge any changes I
> make in it back to the parent).

You mean you push any changes you make in it back to the parent?
Because if you merge them in the parent, the parent will have a
different revision-id, even though the files will have the same contents.

> What did I miss?

I am not sure.  Since you're out of date, you should probably run "bzr
update" first, then revert and merge as before.

> If there are no better ideas, I would tend to "bzr update -r" to some
> old revision which I know was in sync with the parent, then do the
> same "bzr merge --pull" again from the parent to get this branch in
> sync.

I didn't realize you were doing merge --pull until now.  Please be more
explicit about that in the future, as that option radically changes the
behaviour-- it's not what I understand "bzr merge" to mean.  I suspect
that your merge --pull was actually doing a pull, not a merge, when this
happened.  That would explain why your tree was out of date.

Doing "update -r" with an old revno will not do what you want.  Your
tree is already on an old revision-- you need to get it up to date with
its branch.  "bzr update" WITHOUT -r will do that.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk0AKCoACgkQ0F+nu1YWqI2wDgCeNxsQ/NfJHU5W4CpSYhv87rAn
ksgAn2SVgTSJ5q+WlkOfKfMgr0Xf39Mc
=1ce5
-----END PGP SIGNATURE-----