Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-up-local-change.out @ 380:c72ccad3e3b8
Merge with TAH
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge with TAH
manifest hash: 18cf61cc2b6611d74ffc490b6b733537b879d69e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsQy7ywK+sNU5EO8RAoi/AKCC0XbK73oemLr52KOQWEK4WlE9pgCgkk/8
C/m6MZJqlOKhIT4jazPwngU=
=ECGy
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 15 Jun 2005 21:23:07 -0800 |
parents | e5d769afd3ef |
children | 37249c522770 |
line wrap: on
line source
+ 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 a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e a versions differ, resolve remote created b getting b merging a resolving a file a: other d730145abbf9 ancestor b789fdd96dc2 + hg -d up -m resolving manifests ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e + 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