Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-filebranch @ 993:6f274afc05c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up some merge logic - rename mode to branch_merge - use explicit update mode - use negative mtime for updates that set mtime - expand some cryptic variable names - elaborate merge dirstate comments - remove redundant manifest lookup for non-merge case - remove impossible merge case - fix up test cases
author mpm@selenic.com
date Tue, 23 Aug 2005 02:19:38 -0700
parents 5007e0bdeed2
children 7544700fd931
line wrap: on
line diff
--- a/tests/test-filebranch
+++ b/tests/test-filebranch
@@ -41,7 +41,7 @@ hg debugstate | cut -b 1-16,35-
 
 echo merging
 hg pull ../a
-env HGMERGE=../merge hg update -vm --debug
+env HGMERGE=../merge hg update -vm
 
 echo 2m > foo
 echo 2b > baz
@@ -55,6 +55,9 @@ hg ci -m "merge" -d "0 0"
 echo "main: we should have a merge here"
 hg debugindex .hg/00changelog.i
 
+echo "log should show foo and quux changed"
+hg log -v -r tip
+
 echo "foo: we should have a merge here"
 hg debugindex .hg/data/foo.i
 
@@ -67,6 +70,9 @@ hg debugindex .hg/data/baz.i
 echo "quux: we shouldn't have a merge here"
 hg debugindex .hg/data/quux.i
 
+echo "manifest entries should match tips of all files"
+hg manifest
+
 echo "everything should be clean now"
 hg status