Commits

Matt Mackall committed 7d4e98b

bookmarks: backed out new message from changeset 52c7e171e355

Not strictly a bugfix, hasn't achieved consensus yet.

  • Participants
  • Parent commits 52c7e17
  • Branches stable

Comments (0)

Files changed (4)

                 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

tests/test-bookmarks-pushpull.t

   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
   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

tests/test-bookmarks.t

   $ 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
   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
   $ 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

tests/test-clone.t

   $ hg clone . ../i
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  active bookmark: @
   $ hg id -i ../i
   a7949464abda