Bazaar

pending merge tip - I don't understand

Asked by Bryan

I have a simple repository with no branches, just the trunk. When the repo was at rev no. 59, I made some changes to a file, committed them to the repo, and did some testing. The rev no. became 60, and I updated my repos on my local machine and the server.

I later found that I wanted to go back to file in the previous state, so I "reverted" to rev no. 59. Whenever I do "bzr status" on the server, I get the following:

pending merges:
  Bryan 2010-01-08 <...message from when the change was committed previously...>

What does this mean, and is there a way to resolve this so the repo does not display the pending merge? I have looked at the files both on the local disk and on the server, and they have been reverted to the status at rev no. 59.

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
John A Meinel (jameinel) said : 		#1

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

Bryan wrote:
> New question #96677 on Bazaar:
> https://answers.launchpad.net/bzr/+question/96677
>
> I have a simple repository with no branches, just the trunk. When the repo was at rev no. 59, I made some changes to a file, committed them to the repo, and did some testing. The rev no. became 60, and I updated my repos on my local machine and the server.
>
> I later found that I wanted to go back to file in the previous state, so I "reverted" to rev no. 59. Whenever I do "bzr status" on the server, I get the following:
>
> pending merges:
> Bryan 2010-01-08 <...message from when the change was committed previously...>
>
> What does this mean, and is there a way to resolve this so the repo does not display the pending merge? I have looked at the files both on the local disk and on the server, and they have been reverted to the status at rev no. 59.
>

bzr revert

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAktHVOYACgkQJdeBCYSNAAOg9ACfTtY6IsSssfCu4am1hRQ4E33z
wNAAoKyVdLrzQyZuUq58wCLmYe+8+dbL
=5xPX
-----END PGP SIGNATURE-----

Can you help with this problem?

Provide an answer of your own, or ask Bryan for more information if necessary.

To post a message you must log in.