Mercurial > public > mercurial-scm > hg
diff tests/test-push-warn.t @ 12328:b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 17 Sep 2010 17:03:08 -0500 |
parents | 4134686b83e1 |
children | 22f3353bcc36 |
line wrap: on
line diff
--- a/tests/test-push-warn.t Fri Sep 17 17:03:04 2010 -0500 +++ b/tests/test-push-warn.t Fri Sep 17 17:03:08 2010 -0500 @@ -466,8 +466,8 @@ $ hg ci -Amb adding b -# b is now branch head of B, and a topological head -# a is now branch head of A, but not a topological head +b is now branch head of B, and a topological head +a is now branch head of A, but not a topological head $ hg clone . inner updating to branch B @@ -479,7 +479,7 @@ $ hg ci -Amb1 adding b1 -# in the clone b1 is now the head of B +in the clone b1 is now the head of B $ cd .. $ hg up 0 @@ -488,8 +488,9 @@ $ hg ci -Ama2 adding a2 -# a2 is now the new branch head of A, and a new topological head -# it replaces a former inner branch head, so it should at most warn about A, not B +a2 is now the new branch head of A, and a new topological head +it replaces a former inner branch head, so it should at most warn about +A, not B glog of local: @@ -542,7 +543,7 @@ $ hg ci -Amb adding b -# b is now branch head of B, and a topological head +b is now branch head of B, and a topological head $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -550,7 +551,7 @@ $ hg ci -Ama1 adding a1 -# a1 is now branch head of A, and a topological head +a1 is now branch head of A, and a topological head $ hg clone . inner updating to branch A @@ -562,15 +563,15 @@ $ hg ci -Amb1 adding b1 -# in the clone b1 is now the head of B +in the clone b1 is now the head of B $ cd .. $ echo a2 >a2 $ hg ci -Ama2 adding a2 -# a2 is now the new branch head of A, and a topological head -# it replaces a former topological and branch head, so this should not warn +a2 is now the new branch head of A, and a topological head +it replaces a former topological and branch head, so this should not warn glog of local: @@ -706,6 +707,3 @@ searching for changes no changes found [1] - - $ cd .. -