Mercurial > hg
view tests/test-up-local-change.out @ 556:f6c6fa15ff70
Move dirstate.uniq to util.unique
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Move dirstate.uniq to util.unique
manifest hash: 8ac613c30a4471f14ae52f14ed0839d66eeaebb7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxQAqywK+sNU5EO8RAsTiAJ9E9/cALe+W8ojtfVdiXXre5dB/9gCeOgxr
mRnVw/WDplkATW5450Pgsug=
=xSfl
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 01 Jul 2005 00:34:50 -0800 |
parents | 4fc63e22b1fe |
children | eb46971fc57f |
line wrap: on
line source
+ mkdir r1 + cd r1 + hg init + echo a + hg addremove + hg commit -t 1 -u test -d '0 0' + hg clone . ../r2 + cd ../r2 + hg up + echo abc + hg diff + sed 's/\(\(---\|+++\).*\)\t.*/\1/' diff -r c19d34741b0a a --- 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 tag: tip user: test date: Thu Jan 1 00:00:00 1970 summary: 2 + hg -v history changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 tag: tip manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 user: test date: Thu Jan 1 00:00:00 1970 files: a b description: 2 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 user: test date: Thu Jan 1 00:00:00 1970 files: a description: 1 + hg diff + sed 's/\(\(---\|+++\).*\)\t.*/\1/' diff -r 1e71731e6fbb a --- a/a +++ b/a @@ -1,1 +1,1 @@ -a2 +abc