Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-remove.out @ 1822:64df4220b349

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copy/rename to a removed destination file When the destination of a copy or rename operation has been marked for removal, we need to restore it before we overwrite it with the new content. This also handles the case of idempotent renames, i.e. hg rename "a" "b" hg rename "b" "a"
author Robin Farine <robin.farine@terminus.org>
date Tue, 28 Feb 2006 23:47:40 -0800
parents c6ffedc4f11b
children 7544700fd931
line wrap: on
line source

# HG changeset patch
# User test
# Node ID b51ca55c20354097ca299529d18b5cd356976ba2
# Parent  0000000000000000000000000000000000000000
1

diff -r 000000000000 -r b51ca55c2035 foo
--- /dev/null	Thu Jan  1 00:00:00 1970 +0000
+++ b/foo	Thu Jan  1 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+a
# HG changeset patch
# User test
# Node ID 451c12a24e5a7336921b8d93e280837d7c2b4fc1
# Parent  b51ca55c20354097ca299529d18b5cd356976ba2
2

diff -r b51ca55c2035 -r 451c12a24e5a foo
--- a/foo	Thu Jan  1 00:00:00 1970 +0000
+++ /dev/null	Thu Jan  1 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-a
changeset:   0:b51ca55c2035
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     1

diff -r 000000000000 -r b51ca55c2035 foo
--- /dev/null	Thu Jan  1 00:00:00 1970 +0000
+++ b/foo	Thu Jan  1 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+a


changeset:   1:451c12a24e5a
tag:         tip
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     2

diff -r b51ca55c2035 -r 451c12a24e5a foo
--- a/foo	Thu Jan  1 00:00:00 1970 +0000
+++ /dev/null	Thu Jan  1 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-a