Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-up-local-change.out @ 331:55f63f3b6a54
Add a simple testing framework
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add a simple testing framework
manifest hash: 9eeea72f2f33438040998a190183958764232ece
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCr0wKywK+sNU5EO8RAl9FAJ4o1QUA/YE2hCSlUPngR8h30hT1xQCgoEhu
um2QkJOc2Rz7i6xTGPxuqzU=
=YyUM
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Tue, 14 Jun 2005 13:28:42 -0800 |
| parents | |
| children | b2293093b89e b4e0e20646bb |
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/tests/test-up-local-change.out @@ -0,0 +1,70 @@ ++ mkdir r1 ++ cd r1 ++ hg init ++ echo a ++ hg addremove ++ hg commit -t 1 -u test -d '0 0' ++ cd .. ++ mkdir r2 ++ cd r2 ++ hg init ../r1 ++ hg up ++ echo abc ++ hg diff ++ sed 's/\(\(---\|+++\).*\)\t.*/\1/' +--- a/a ++++ b/a +@@ -1,1 +1,1 @@ +-a ++abc ++ cd ../r1 ++ echo b ++ echo a2 ++ hg addremove ++ hg commit -t 2 -u test -d '0 0' ++ cd ../r2 ++ hg -q pull ../r1 ++ hg status +C a ++ hg -d up +resolving manifests + ancestor a0c8bcbb local a0c8bcbb remote 1165e8bd + a versions differ, resolve +remote created b +getting b +merging a +resolving a +file a: other d730145a ancestor b789fdd9 ++ hg -d up -m +resolving manifests + ancestor 1165e8bd local 1165e8bd remote 1165e8bd ++ hg parents +changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 +user: test +date: Wed Dec 31 16:00:00 1969 +summary: 2 + ++ hg -v history +changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 +manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 +user: test +date: Wed Dec 31 16:00:00 1969 +files: a b +description: +2 + +changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e +manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 +user: test +date: Wed Dec 31 16:00:00 1969 +files: a +description: +1 + ++ hg diff ++ sed 's/\(\(---\|+++\).*\)\t.*/\1/' +--- a/a ++++ b/a +@@ -1,1 +1,1 @@ +-a2 ++abc