Mercurial > hg > mercurial-crew-with-dirclash
annotate 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 |
rev | line source |
---|---|
331 | 1 + mkdir r1 |
2 + cd r1 | |
3 + hg init | |
4 + echo a | |
5 + hg addremove | |
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
6 adding a |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
748
diff
changeset
|
7 + hg commit -m 1 -d '0 0' |
485 | 8 + hg clone . ../r2 |
9 + cd ../r2 | |
331 | 10 + hg up |
11 + echo abc | |
12 + hg diff | |
775 | 13 + sed 's/\(\(---\|+++\) [^ \t]*\)[ \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
|
14 diff -r c19d34741b0a a |
331 | 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 | |
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
24 adding b |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
748
diff
changeset
|
25 + hg commit -m 2 -d '0 0' |
331 | 26 + cd ../r2 |
27 + hg -q pull ../r1 | |
28 + hg status | |
748 | 29 M a |
591 | 30 + hg --debug up |
331 | 31 resolving manifests |
677
204328d345f1
Fix up test for update flags
Matt Mackall <mpm@selenic.com>
parents:
676
diff
changeset
|
32 force None allow None moddirstate True linear True |
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
350
diff
changeset
|
33 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
331 | 34 a versions differ, resolve |
35 remote created b | |
36 getting b | |
37 merging a | |
38 resolving a | |
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
350
diff
changeset
|
39 file a: other d730145abbf9 ancestor b789fdd96dc2 |
591 | 40 + hg --debug up -m |
331 | 41 resolving manifests |
677
204328d345f1
Fix up test for update flags
Matt Mackall <mpm@selenic.com>
parents:
676
diff
changeset
|
42 force None allow 1 moddirstate True linear True |
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
350
diff
changeset
|
43 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e |
331 | 44 + hg parents |
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
775
diff
changeset
|
45 changeset: 1:1e71731e6fbb |
388
398737777644
Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
382
diff
changeset
|
46 tag: tip |
331 | 47 user: test |
382
37249c522770
test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents:
377
diff
changeset
|
48 date: Thu Jan 1 00:00:00 1970 |
331 | 49 summary: 2 |
50 | |
51 + hg -v history | |
52 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
|
53 tag: tip |
331 | 54 user: test |
382
37249c522770
test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents:
377
diff
changeset
|
55 date: Thu Jan 1 00:00:00 1970 |
494
6020bde714e4
Fixed test for previous change of 'hg -v history'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
490
diff
changeset
|
56 files: a b |
331 | 57 description: |
58 2 | |
59 | |
546
c8ae964109c1
Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
495
diff
changeset
|
60 |
331 | 61 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
62 user: test | |
382
37249c522770
test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents:
377
diff
changeset
|
63 date: Thu Jan 1 00:00:00 1970 |
494
6020bde714e4
Fixed test for previous change of 'hg -v history'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
490
diff
changeset
|
64 files: a |
331 | 65 description: |
66 1 | |
67 | |
546
c8ae964109c1
Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
495
diff
changeset
|
68 |
331 | 69 + hg diff |
775 | 70 + sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/' |
768
20e95c245bc3
Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents:
767
diff
changeset
|
71 diff -r 1e71731e6fbb a |
20e95c245bc3
Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents:
767
diff
changeset
|
72 --- a/a |
20e95c245bc3
Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents:
767
diff
changeset
|
73 +++ b/a |
20e95c245bc3
Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents:
767
diff
changeset
|
74 @@ -1,1 +1,1 @@ |
20e95c245bc3
Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents:
767
diff
changeset
|
75 -a2 |
20e95c245bc3
Fix local file changes being ignored after non-branch merge
mpm@selenic.com
parents:
767
diff
changeset
|
76 +abc |