view tests/test-remove.out @ 5080:73fdc8bd3ed8

Update on pull -u when heads were closed (fixes issue666).
Patch written by Benoit Boissinot.

This should probably be improved in the future to handle long-living
branches, as joining two "other" heads will switch to that new head.
But this is not a new problem, as adding to the "other" head would have
switched to that new head, too.

not removing foo: file is not managed
abort: no files specified
undeleting foo
removing foo
# HG changeset patch
# User test
# Date 1000000 0
# Node ID 8ba83d44753d6259db5ce6524974dd1174e90f47
# Parent  0000000000000000000000000000000000000000
1

diff -r 000000000000 -r 8ba83d44753d foo
--- /dev/null
+++ b/foo
@@ -0,0 +1,1 @@
+a
# HG changeset patch
# User test
# Date 1000000 0
# Node ID a1fce69c50d97881c5c014ab23f580f720c78678
# Parent  8ba83d44753d6259db5ce6524974dd1174e90f47
2

diff -r 8ba83d44753d -r a1fce69c50d9 foo
--- a/foo
+++ /dev/null
@@ -1,1 +0,0 @@
-a
changeset:   0:8ba83d44753d
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

diff -r 000000000000 -r 8ba83d44753d foo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/foo	Mon Jan 12 13:46:40 1970 +0000
@@ -0,0 +1,1 @@
+a

changeset:   1:a1fce69c50d9
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

diff -r 8ba83d44753d -r a1fce69c50d9 foo
--- a/foo	Mon Jan 12 13:46:40 1970 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-a

not removing a: file has been marked for add (use -f to force removal)
adding a
adding b
adding c/d
not removing b: file is modified (use -f to force removal)
R b
R c/d
d
undeleting c/d
R b
R b
removing c/d
R b
R c/d
3 files updated, 0 files merged, 0 files removed, 0 files unresolved