confusing messages
Sam Steingold
sds at gnu.org
Wed Feb 28 19:21:18 GMT 2007
James Westby wrote:
> On (28/02/07 12:07), Sam Steingold wrote:
>
>> $ bzr status
>> pending merges:
>> Stefan Reichoer 2007-01-29 Applied minor fix for dvc-build.el from
>> Sascha...
>
> This means that you have done a merge from the other branch, but haven't
> done the last step of committing it. This step is required as you are
> supposed to ensure that the merge happened as you wanted. You then make
> a commit to say that you are happy with the current state and want to
> carry on.
This appears to imply that I need to do "bzr commit" after "bzr update".
I did it and got:
$ bzr commit
Committed revision 137.
$ bzr missing
Using last location: http://bzr.xsteve.at/dvc/
You have 1 extra revision(s):
# this appears to imply that the master branch has 136 revisions,
# while mine has 137 revisions, which is not good.
------------------------------------------------------------
revno: 137
committer: Sam Steingold <sds at janestcapital.com>
# I am not! the committer is Stefan Reichoer !!!
branch nick: dvc
timestamp: Wed 2007-02-28 14:13:40 -0500
message:
Stefan Reichoer 2007-01-29 Applied minor fix for dvc-build.el from
Sascha...
$ bzr status
$ bzr merge
Merging from remembered location http://bzr.xsteve.at/dvc/
Nothing to do.
$ bzr update
Tree is up to date at revision 137.
$ bzr uncommit
137 Sam Steingold 2007-02-28
Stefan Reichoer 2007-01-29 Applied minor fix for dvc-build.el
from Sascha...
The above revision(s) will be removed.
Are you sure [y/N]? y
$ bzr missing
Using last location: http://bzr.xsteve.at/dvc/
Branches are up to date.
$ bzr status
pending merges:
Stefan Reichoer 2007-01-29 Applied minor fix for dvc-build.el from
Sascha...
So, I am still confused: what do I need to do?
thanks for your detailed and informative reply!
Sam.
More information about the bazaar
mailing list