Mercurial > hg
changeset 17872:7d4e98bf114d stable
bookmarks: backed out new message from changeset 52c7e171e355
Not strictly a bugfix, hasn't achieved consensus yet.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 27 Oct 2012 16:39:47 -0500 |
| parents | 52c7e171e355 |
| children | 573bec4ab7ba |
| files | mercurial/hg.py tests/test-bookmarks-pushpull.t tests/test-bookmarks.t tests/test-clone.t |
| diffstat | 4 files changed, 0 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hg.py Fri Oct 26 14:53:31 2012 +0200 +++ b/mercurial/hg.py Sat Oct 27 16:39:47 2012 -0500 @@ -428,7 +428,6 @@ destrepo.ui.status(_("updating to branch %s\n") % bn) _update(destrepo, uprev) if update in destrepo._bookmarks: - destrepo.ui.status(_("active bookmark: %s\n") % update) bookmarks.setcurrent(destrepo, update) return srcpeer, destpeer
--- a/tests/test-bookmarks-pushpull.t Fri Oct 26 14:53:31 2012 +0200 +++ b/tests/test-bookmarks-pushpull.t Sat Oct 27 16:39:47 2012 -0500 @@ -337,7 +337,6 @@ added 5 changesets with 5 changes to 3 files (+2 heads) updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - active bookmark: @ $ hg -R cloned-bookmarks bookmarks * @ 1:9b140be10808 X 1:9b140be10808 @@ -358,7 +357,6 @@ added 5 changesets with 5 changes to 3 files (+2 heads) updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - active bookmark: @ $ cd addmarks $ echo foo > foo $ hg add foo
--- a/tests/test-bookmarks.t Fri Oct 26 14:53:31 2012 +0200 +++ b/tests/test-bookmarks.t Sat Oct 27 16:39:47 2012 -0500 @@ -365,7 +365,6 @@ $ hg clone . cloned-bookmarks updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - active bookmark: @ $ hg -R cloned-bookmarks bookmarks * @ 2:db815d6d32e6 X2 1:925d80f479bb @@ -384,7 +383,6 @@ added 3 changesets with 3 changes to 3 files (+1 heads) updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - active bookmark: @ $ hg -R cloned-bookmarks-pull bookmarks * @ 2:db815d6d32e6 X2 1:925d80f479bb @@ -429,7 +427,6 @@ $ hg clone -u Z . cloned-bookmarks-update updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved - active bookmark: Z $ hg -R cloned-bookmarks-update bookmarks X2 1:925d80f479bb Y 2:db815d6d32e6