Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-up-local-change.out @ 349:b2293093b89e
Merged with mercurial-identify (which includes upstream's current tip)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merged with mercurial-identify (which includes upstream's current tip)
manifest hash: b135d201757b84bbe7f14a446d2b001fd0cc1aa2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCr9mNW7P1GVgWeRoRAmTjAJ919wnvZXbKI27N0cDJCrumR3z4rQCcD6PO
yZTmrT6p+gt6GBO+j5FVBn0=
=HWn8
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 15 Jun 2005 08:32:29 +0100 |
parents | 55f63f3b6a54 |
children | b4e0e20646bb |
comparison
equal
deleted
inserted
replaced
348:442eb02cf870 | 349:b2293093b89e |
---|---|
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/' | |
15 --- a/a | |
16 +++ b/a | |
17 @@ -1,1 +1,1 @@ | |
18 -a | |
19 +abc | |
20 + cd ../r1 | |
21 + echo b | |
22 + echo a2 | |
23 + hg addremove | |
24 + hg commit -t 2 -u test -d '0 0' | |
25 + cd ../r2 | |
26 + hg -q pull ../r1 | |
27 + hg status | |
28 C a | |
29 + hg -d up | |
30 resolving manifests | |
31 ancestor a0c8bcbb local a0c8bcbb remote 1165e8bd | |
32 a versions differ, resolve | |
33 remote created b | |
34 getting b | |
35 merging a | |
36 resolving a | |
37 file a: other d730145a ancestor b789fdd9 | |
38 + hg -d up -m | |
39 resolving manifests | |
40 ancestor 1165e8bd local 1165e8bd remote 1165e8bd | |
41 + hg parents | |
42 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | |
43 user: test | |
44 date: Wed Dec 31 16:00:00 1969 | |
45 summary: 2 | |
46 | |
47 + hg -v history | |
48 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | |
49 manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 | |
50 user: test | |
51 date: Wed Dec 31 16:00:00 1969 | |
52 files: a b | |
53 description: | |
54 2 | |
55 | |
56 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | |
57 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | |
58 user: test | |
59 date: Wed Dec 31 16:00:00 1969 | |
60 files: a | |
61 description: | |
62 1 | |
63 | |
64 + hg diff | |
65 + sed 's/\(\(---\|+++\).*\)\t.*/\1/' | |
66 --- a/a | |
67 +++ b/a | |
68 @@ -1,1 +1,1 @@ | |
69 -a2 | |
70 +abc |