Fix up tests for command name changes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix up tests for command name changes
manifest hash: 04b04d0b2ca96f29b3b9a52e4ed8478ee7e2761f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuvDTywK+sNU5EO8RAnKzAJ9JSRUsVy/kHp3CweXpsJiu+fXCKQCgq0Pt
OOUKYPj6aJOvxB+Zz17X8dg=
=EyYE
-----END PGP SIGNATURE-----
--- a/tests/test-flags Thu Jun 23 09:22:30 2005 -0800
+++ b/tests/test-flags Thu Jun 23 09:26:43 2005 -0800
@@ -13,7 +13,7 @@
cd test2
hg init
-hg merge ../test1
+hg pull ../test1
hg co
chmod +x a
hg ci -t "chmod +x a" -u test -d "0 0"
@@ -22,7 +22,7 @@
echo 123 >>a
hg ci -t "a updated" -u test -d "0 0"
-hg merge ../test2
+hg pull ../test2
hg heads
hg history
--- a/tests/test-help.out Thu Jun 23 09:22:30 2005 -0800
+++ b/tests/test-help.out Thu Jun 23 09:26:43 2005 -0800
@@ -14,11 +14,11 @@
help show help for a given command or all commands
history show the changelog history
identify print information about the working copy
+ import import an ordered set of patches
init create a new repository or copy an existing one
log show the revision history of a single file
manifest output the latest or given revision of the project manifest
parents show the parents of the current working dir
- patch import an ordered set of patches
pull pull changes from the specified source
push push changes to the specified destination
rawcommit raw commit interface
@@ -63,11 +63,11 @@
help show help for a given command or all commands
history show the changelog history
identify print information about the working copy
+ import import an ordered set of patches
init create a new repository or copy an existing one
log show the revision history of a single file
manifest output the latest or given revision of the project manifest
parents show the parents of the current working dir
- patch import an ordered set of patches
pull pull changes from the specified source
push push changes to the specified destination
rawcommit raw commit interface