Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-up-local-change.out @ 793:445970ccf57a
Merge with upstream
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 06:43:21 +0100 |
parents | 20e95c245bc3 853bfbf1a312 |
children | 1f9ec150a476 |
comparison
equal
deleted
inserted
replaced
792:49ec802b4a16 | 793:445970ccf57a |
---|---|
8 + hg clone . ../r2 | 8 + hg clone . ../r2 |
9 + cd ../r2 | 9 + cd ../r2 |
10 + hg up | 10 + hg up |
11 + echo abc | 11 + echo abc |
12 + hg diff | 12 + hg diff |
13 + sed 's/\(\(---\|+++\).*\)\t.*/\1/' | 13 + sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/' |
14 diff -r c19d34741b0a a | 14 diff -r c19d34741b0a a |
15 --- a/a | 15 --- a/a |
16 +++ b/a | 16 +++ b/a |
17 @@ -1,1 +1,1 @@ | 17 @@ -1,1 +1,1 @@ |
18 -a | 18 -a |
40 + hg --debug up -m | 40 + hg --debug up -m |
41 resolving manifests | 41 resolving manifests |
42 force None allow 1 moddirstate True linear True | 42 force None allow 1 moddirstate True linear True |
43 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e | 43 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e |
44 + hg parents | 44 + hg parents |
45 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | 45 changeset: 1:1e71731e6fbb |
46 tag: tip | 46 tag: tip |
47 user: test | 47 user: test |
48 date: Thu Jan 1 00:00:00 1970 | 48 date: Thu Jan 1 00:00:00 1970 |
49 summary: 2 | 49 summary: 2 |
50 | 50 |
51 + hg -v history | 51 + hg -v history |
52 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | 52 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 |
53 tag: tip | 53 tag: tip |
54 manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 | |
55 user: test | 54 user: test |
56 date: Thu Jan 1 00:00:00 1970 | 55 date: Thu Jan 1 00:00:00 1970 |
57 files: a b | 56 files: a b |
58 description: | 57 description: |
59 2 | 58 2 |
60 | 59 |
61 | 60 |
62 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | 61 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
63 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | |
64 user: test | 62 user: test |
65 date: Thu Jan 1 00:00:00 1970 | 63 date: Thu Jan 1 00:00:00 1970 |
66 files: a | 64 files: a |
67 description: | 65 description: |
68 1 | 66 1 |
69 | 67 |
70 | 68 |
71 + hg diff | 69 + hg diff |
72 + sed 's/\(\(---\|+++\).*\)\t.*/\1/' | 70 + sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/' |
73 diff -r 1e71731e6fbb a | 71 diff -r 1e71731e6fbb a |
74 --- a/a | 72 --- a/a |
75 +++ b/a | 73 +++ b/a |
76 @@ -1,1 +1,1 @@ | 74 @@ -1,1 +1,1 @@ |
77 -a2 | 75 -a2 |