# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1403549444 18000
# Node ID 15baed3f24ee98a7aaecfaf9b8c93e3695c9a813
# Parent  c20843aee8a4853d5bd310b37d7b0a1466ca0e89
branchmap: don't use ui.warn for debug message

diff -r c20843aee8a4 -r 15baed3f24ee mercurial/branchmap.py
--- a/mercurial/branchmap.py	Mon Jun 23 13:46:42 2014 -0500
+++ b/mercurial/branchmap.py	Mon Jun 23 13:50:44 2014 -0500
@@ -58,7 +58,7 @@
             if repo.filtername is not None:
                 msg += ' (%s)' % repo.filtername
             msg += ': %s\n'
-            repo.ui.warn(msg % inst)
+            repo.ui.debug(msg % inst)
         partial = None
     return partial
 
diff -r c20843aee8a4 -r 15baed3f24ee mercurial/commands.py
--- a/mercurial/commands.py	Mon Jun 23 13:46:42 2014 -0500
+++ b/mercurial/commands.py	Mon Jun 23 13:50:44 2014 -0500
@@ -2314,6 +2314,7 @@
     """create arbitrary obsolete marker
 
     With no arguments, displays the list of obsolescence markers."""
+
     def parsenodeid(s):
         try:
             # We do not use revsingle/revrange functions here to accept
diff -r c20843aee8a4 -r 15baed3f24ee tests/test-keyword.t
--- a/tests/test-keyword.t	Mon Jun 23 13:46:42 2014 -0500
+++ b/tests/test-keyword.t	Mon Jun 23 13:50:44 2014 -0500
@@ -507,7 +507,6 @@
   $ hg -q commit -d '14 1' -m 'prepare amend'
 
   $ hg --debug commit --amend -d '15 1' -m 'amend without changes' | grep keywords
-  invalid branchheads cache (served): tip differs
   overwriting a expanding keywords
   $ hg -q id
   67d8c481a6be
diff -r c20843aee8a4 -r 15baed3f24ee tests/test-obsolete-divergent.t
--- a/tests/test-obsolete-divergent.t	Mon Jun 23 13:46:42 2014 -0500
+++ b/tests/test-obsolete-divergent.t	Mon Jun 23 13:50:44 2014 -0500
@@ -27,7 +27,7 @@
   >    hg ci -m "$1"
   > }
   $ getid() {
-  >    hg id --debug --hidden -ir "desc('$1')"
+  >    hg log --hidden -r "desc('$1')" -T '{node}\n'
   > }
 
 setup repo
@@ -62,7 +62,6 @@
   $ newcase direct
   $ hg debugobsolete `getid A_0` `getid A_1`
   $ hg debugobsolete `getid A_0` `getid A_2`
-  invalid branchheads cache (served): tip differs
   $ hg log -G --hidden
   o  3:392fd25390da A_2
   |
@@ -104,7 +103,6 @@
   $ newcase indirect_known
   $ hg debugobsolete `getid A_0` `getid A_1`
   $ hg debugobsolete `getid A_0` `getid A_2`
-  invalid branchheads cache (served): tip differs
   $ mkcommit A_3
   created new head
   $ hg debugobsolete `getid A_2` `getid A_3`
@@ -143,7 +141,6 @@
   $ newcase indirect_unknown
   $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
-  invalid branchheads cache (served): tip differs
   $ hg debugobsolete `getid A_0` `getid A_2`
   $ hg log -G --hidden
   o  3:392fd25390da A_2
@@ -175,7 +172,6 @@
   $ newcase final-unknown
   $ hg debugobsolete `getid A_0` `getid A_1`
   $ hg debugobsolete `getid A_1` `getid A_2`
-  invalid branchheads cache (served): tip differs
   $ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
   $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc
   $ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd
@@ -192,7 +188,6 @@
   $ newcase converged_divergence
   $ hg debugobsolete `getid A_0` `getid A_1`
   $ hg debugobsolete `getid A_0` `getid A_2`
-  invalid branchheads cache (served): tip differs
   $ mkcommit A_3
   created new head
   $ hg debugobsolete `getid A_1` `getid A_3`
@@ -439,7 +434,6 @@
   $ newcase subset
   $ hg debugobsolete `getid A_0` `getid A_2`
   $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
-  invalid branchheads cache (served): tip differs
   $ hg debugsuccessorssets --hidden 'desc('A_0')'
   007dc284c1f8
       82623d38b9ba 392fd25390da