Mercurial > hg
annotate tests/test-remove.out @ 2175:b2ae81a7df29
Make hg update more verbose by default (issue12)
(including small changes to revert and backout to not show these stats
with the exception of backout --merge)
Show update stats (unless -q), e.g.:
K files updated, L files merged, M files removed, N files unresolved
Inform the user what to do after a merge:
(branch merge, don't forget to commit)
Inform the user what to do if a branch merge failed:
There are unresolved merges, you can redo the full merge using:
hg update -C X
hg merge Y
Inform the user what to do if a working directory merge failed:
There are unresolved merges with locally modified files.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 02 May 2006 18:44:02 +0200 |
parents | 379ab45b91b7 |
children | 82385773df6c |
rev | line source |
---|---|
1570
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
1 # HG changeset patch |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
2 # User test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1645
diff
changeset
|
3 # Node ID 8ba83d44753d6259db5ce6524974dd1174e90f47 |
1570
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
4 # Parent 0000000000000000000000000000000000000000 |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
5 1 |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
6 |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1645
diff
changeset
|
7 diff -r 000000000000 -r 8ba83d44753d foo |
1953
379ab45b91b7
change default strftime format for better portability
TK Soh <teekaysoh@yahoo.com>
parents:
1933
diff
changeset
|
8 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1645
diff
changeset
|
9 +++ b/foo Mon Jan 12 13:46:40 1970 +0000 |
1570
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
10 @@ -0,0 +1,1 @@ |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
11 +a |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
12 # HG changeset patch |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
13 # User test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1645
diff
changeset
|
14 # Node ID a1fce69c50d97881c5c014ab23f580f720c78678 |
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1645
diff
changeset
|
15 # Parent 8ba83d44753d6259db5ce6524974dd1174e90f47 |
1570
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
16 2 |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
17 |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1645
diff
changeset
|
18 diff -r 8ba83d44753d -r a1fce69c50d9 foo |
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1645
diff
changeset
|
19 --- a/foo Mon Jan 12 13:46:40 1970 +0000 |
1953
379ab45b91b7
change default strftime format for better portability
TK Soh <teekaysoh@yahoo.com>
parents:
1933
diff
changeset
|
20 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1570
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
21 @@ -1,1 +0,0 @@ |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
22 -a |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1645
diff
changeset
|
23 changeset: 0:8ba83d44753d |
1570
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
24 user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1645
diff
changeset
|
25 date: Mon Jan 12 13:46:40 1970 +0000 |
1570
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
26 summary: 1 |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
27 |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1645
diff
changeset
|
28 diff -r 000000000000 -r 8ba83d44753d foo |
1953
379ab45b91b7
change default strftime format for better portability
TK Soh <teekaysoh@yahoo.com>
parents:
1933
diff
changeset
|
29 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1645
diff
changeset
|
30 +++ b/foo Mon Jan 12 13:46:40 1970 +0000 |
1570
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
31 @@ -0,0 +1,1 @@ |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
32 +a |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
33 |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
34 |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1645
diff
changeset
|
35 changeset: 1:a1fce69c50d9 |
1570
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
36 tag: tip |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
37 user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1645
diff
changeset
|
38 date: Mon Jan 12 13:46:40 1970 +0000 |
1570
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
39 summary: 2 |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
40 |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1645
diff
changeset
|
41 diff -r 8ba83d44753d -r a1fce69c50d9 foo |
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1645
diff
changeset
|
42 --- a/foo Mon Jan 12 13:46:40 1970 +0000 |
1953
379ab45b91b7
change default strftime format for better portability
TK Soh <teekaysoh@yahoo.com>
parents:
1933
diff
changeset
|
43 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1570
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
44 @@ -1,1 +0,0 @@ |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
45 -a |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
46 |
6a104941d56a
hg log -p should show file deletions
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
47 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1953
diff
changeset
|
48 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |