test-remove.out
67 lines
| 1.4 KiB
| text/plain
|
TextLexer
/ tests / test-remove.out
|
r2309 | not removing foo: file is not managed | ||
|
r2180 | abort: no files specified | ||
undeleting foo | ||||
removing foo | ||||
|
r1570 | # HG changeset patch | ||
# User test | ||||
|
r2302 | # Date 1000000 0 | ||
|
r1933 | # Node ID 8ba83d44753d6259db5ce6524974dd1174e90f47 | ||
|
r1570 | # Parent 0000000000000000000000000000000000000000 | ||
1 | ||||
|
r1933 | diff -r 000000000000 -r 8ba83d44753d foo | ||
|
r3199 | --- /dev/null | ||
+++ b/foo | ||||
|
r1570 | @@ -0,0 +1,1 @@ | ||
+a | ||||
# HG changeset patch | ||||
# User test | ||||
|
r2302 | # Date 1000000 0 | ||
|
r1933 | # Node ID a1fce69c50d97881c5c014ab23f580f720c78678 | ||
# Parent 8ba83d44753d6259db5ce6524974dd1174e90f47 | ||||
|
r1570 | 2 | ||
|
r1933 | diff -r 8ba83d44753d -r a1fce69c50d9 foo | ||
|
r3199 | --- a/foo | ||
+++ /dev/null | ||||
|
r1570 | @@ -1,1 +0,0 @@ | ||
-a | ||||
|
r1933 | changeset: 0:8ba83d44753d | ||
|
r1570 | user: test | ||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1570 | summary: 1 | ||
|
r1933 | diff -r 000000000000 -r 8ba83d44753d foo | ||
|
r1953 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
|
r1933 | +++ b/foo Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1570 | @@ -0,0 +1,1 @@ | ||
+a | ||||
|
r1933 | changeset: 1:a1fce69c50d9 | ||
|
r1570 | tag: tip | ||
user: test | ||||
|
r1933 | date: Mon Jan 12 13:46:40 1970 +0000 | ||
|
r1570 | summary: 2 | ||
|
r1933 | diff -r 8ba83d44753d -r a1fce69c50d9 foo | ||
--- a/foo Mon Jan 12 13:46:40 1970 +0000 | ||||
|
r1953 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||
|
r1570 | @@ -1,1 +0,0 @@ | ||
-a | ||||
|
r2309 | not removing a: file has been marked for add (use -f to force removal) | ||
adding a | ||||
adding b | ||||
|
r4394 | adding c/d | ||
|
r2309 | not removing b: file is modified (use -f to force removal) | ||
|
r4393 | R b | ||
|
r4394 | R c/d | ||
d | ||||
undeleting c/d | ||||
R b | ||||
|
r4393 | R b | ||
|
r4394 | removing c/d | ||
|
r4393 | R b | ||
|
r4394 | R c/d | ||
|
r6338 | updating working directory | ||
|
r4392 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||