diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py --- a/mercurial/bookmarks.py +++ b/mercurial/bookmarks.py @@ -494,6 +494,14 @@ def outgoing(ui, repo, other): outgoings.append(" %-25s %s\n" % (b, getid(id))) for b, scid, dcid in addsrc: add(b, scid) + for b, scid, dcid in adddst: + add(b, ' ' * 40) + for b, scid, dcid in advsrc: + add(b, scid) + for b, scid, dcid in diverge: + add(b, scid) + for b, scid, dcid in differ: + add(b, scid) if not outgoings: ui.status(_("no changed bookmarks found\n")) diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t --- a/tests/test-bookmarks-pushpull.t +++ b/tests/test-bookmarks-pushpull.t @@ -402,8 +402,11 @@ hgweb $ hg out -B http://localhost:$HGPORT/ comparing with http://localhost:$HGPORT/ searching for changed bookmarks - no changed bookmarks found - [1] + @ 0d2164f0ce0d + X 0d2164f0ce0d + Z 0d2164f0ce0d + foo + foobar $ hg push -B Z http://localhost:$HGPORT/ pushing to http://localhost:$HGPORT/ searching for changes