diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -484,6 +484,9 @@ _pushobsolete(pushop) _pushbookmark(pushop) + if repo.ui.configbool('experimental', 'remotenames'): + logexchange.pullremotenames(repo, remote) + return pushop # list of steps to perform discovery before push diff --git a/tests/test-logexchange.t b/tests/test-logexchange.t --- a/tests/test-logexchange.t +++ b/tests/test-logexchange.t @@ -457,11 +457,13 @@ bar 6:87d6d6676308 foo 9:aa6a885086c0 -XXX: remotebookmarks should have been updated after this push $ hg log -G @ changeset: 9:aa6a885086c0 | branch: wat | tag: tip + | remote bookmark: default/foo + | hoistedname: foo + | remote branch: default/wat | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: added foobar @@ -470,7 +472,6 @@ | branch: wat | bookmark: foo | remote branch: $TESTTMP/server2/wat - | remote branch: default/wat | parent: 4:aa98ab95a928 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 @@ -503,8 +504,6 @@ | o changeset: 3:62615734edd5 | remote bookmark: $TESTTMP/server2/foo - | remote bookmark: default/foo - | hoistedname: foo | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: Added d