Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-up-local-change.out @ 455:8d43dfdfb514
More FAQ updates
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
More FAQ updates
manifest hash: 98447c3da5aefcc6c4071d03d8014944cf4cbb79
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCu3TCywK+sNU5EO8RArRjAJ0ZtMHztUL1cQw7FC0C3uJ0YIfKjwCfWfSe
JndrQxPs1QeCPK/RbfYiKjE=
=aMHP
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Thu, 23 Jun 2005 18:49:38 -0800 |
parents | 8f8bb77d560e |
children | c5705ab9cebd |
rev | line source |
---|---|
331 | 1 + mkdir r1 |
2 + cd r1 | |
3 + hg init | |
4 + echo a | |
5 + hg addremove | |
6 + hg commit -t 1 -u test -d '0 0' | |
7 + cd .. | |
8 + mkdir r2 | |
9 + cd r2 | |
10 + hg init ../r1 | |
11 + hg up | |
12 + echo abc | |
13 + hg diff | |
14 + sed 's/\(\(---\|+++\).*\)\t.*/\1/' | |
396
8f8bb77d560e
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
388
diff
changeset
|
15 diff -r c19d34741b0a a |
331 | 16 --- a/a |
17 +++ b/a | |
18 @@ -1,1 +1,1 @@ | |
19 -a | |
20 +abc | |
21 + cd ../r1 | |
22 + echo b | |
23 + echo a2 | |
24 + hg addremove | |
25 + hg commit -t 2 -u test -d '0 0' | |
26 + cd ../r2 | |
27 + hg -q pull ../r1 | |
28 + hg status | |
29 C a | |
30 + hg -d up | |
31 resolving manifests | |
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
350
diff
changeset
|
32 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
331 | 33 a versions differ, resolve |
34 remote created b | |
35 getting b | |
36 merging a | |
37 resolving a | |
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
350
diff
changeset
|
38 file a: other d730145abbf9 ancestor b789fdd96dc2 |
331 | 39 + hg -d up -m |
40 resolving manifests | |
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
350
diff
changeset
|
41 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e |
331 | 42 + hg parents |
43 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | |
388
398737777644
Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
382
diff
changeset
|
44 tag: tip |
331 | 45 user: test |
382
37249c522770
test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents:
377
diff
changeset
|
46 date: Thu Jan 1 00:00:00 1970 |
331 | 47 summary: 2 |
48 | |
49 + hg -v history | |
50 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | |
388
398737777644
Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
382
diff
changeset
|
51 tag: tip |
331 | 52 manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 |
53 user: test | |
382
37249c522770
test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents:
377
diff
changeset
|
54 date: Thu Jan 1 00:00:00 1970 |
331 | 55 files: a b |
56 description: | |
57 2 | |
58 | |
59 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | |
60 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | |
61 user: test | |
382
37249c522770
test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents:
377
diff
changeset
|
62 date: Thu Jan 1 00:00:00 1970 |
331 | 63 files: a |
64 description: | |
65 1 | |
66 | |
67 + hg diff | |
68 + sed 's/\(\(---\|+++\).*\)\t.*/\1/' | |
396
8f8bb77d560e
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
388
diff
changeset
|
69 diff -r 1e71731e6fbb a |
331 | 70 --- a/a |
71 +++ b/a | |
72 @@ -1,1 +1,1 @@ | |
73 -a2 | |
74 +abc |