Mercurial > hg

diff tests/svn/replace.svndump @ 13052:5fb924ee44d5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert/svn: fix changed files list upon directory replacements When branch2/dir was replacing branch1/dir, we only marked branch2/dir files a changed. Add branch1/dir files as they may not exist in branch2.
author Patrick Mezard <pmezard@gmail.com>
date Mon, 29 Nov 2010 20:13:11 +0100
parents a9b427b5821e
children
line wrap: on
line diff
--- a/tests/svn/replace.svndump	Fri Nov 26 20:05:16 2010 -0600
+++ b/tests/svn/replace.svndump	Mon Nov 29 20:13:11 2010 +0100
@@ -1,6 +1,6 @@
 SVN-fs-dump-format-version: 2
 
-UUID: 4a895937-439c-4e56-b7b0-fa1c8acc0c20
+UUID: 97a955ef-0269-44f2-a58f-abd4ad400b2b
 
 Revision-number: 0
 Prop-content-length: 56
@@ -9,7 +9,7 @@
 K 8
 svn:date
 V 27
-2010-05-09T14:57:31.007802Z
+2010-11-26T18:01:12.912988Z
 PROPS-END
 
 Revision-number: 1
@@ -27,7 +27,7 @@
 K 8
 svn:date
 V 27
-2010-05-09T14:57:32.094732Z
+2010-11-26T18:01:13.106933Z
 PROPS-END
 
 Node-path: branches
@@ -83,6 +83,28 @@
 b
 
 
+Node-path: trunk/d2
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk/d2/a
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 2
+Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
+Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b
+Content-length: 12
+
+PROPS-END
+a
+
+
 Node-path: trunk/dlink
 Node-kind: file
 Node-action: add
@@ -146,7 +168,7 @@
 K 8
 svn:date
 V 27
-2010-05-09T14:57:33.071117Z
+2010-11-26T18:01:14.073483Z
 PROPS-END
 
 Node-path: trunk/dlink3
@@ -177,7 +199,7 @@
 K 8
 svn:date
 V 27
-2010-05-09T14:57:35.268057Z
+2010-11-26T18:01:16.205184Z
 PROPS-END
 
 Node-path: trunk/a
@@ -221,7 +243,7 @@
 K 8
 svn:date
 V 27
-2010-05-09T14:57:35.521816Z
+2010-11-26T18:01:16.395962Z
 PROPS-END
 
 Node-path: trunk/dlink3
@@ -239,3 +261,107 @@
 
 
 
+Revision-number: 5
+Prop-content-length: 106
+Content-length: 106
+
+K 7
+svn:log
+V 5
+adddb
+K 10
+svn:author
+V 7
+pmezard
+K 8
+svn:date
+V 27
+2010-11-26T18:01:16.445072Z
+PROPS-END
+
+Node-path: trunk/d2/b
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 2
+Text-content-md5: 3b5d5c3712955042212316173ccf37be
+Text-content-sha1: 89e6c98d92887913cadf06b2adb97f26cde4849b
+Content-length: 12
+
+PROPS-END
+b
+
+
+Revision-number: 6
+Prop-content-length: 107
+Content-length: 107
+
+K 7
+svn:log
+V 6
+branch
+K 10
+svn:author
+V 7
+pmezard
+K 8
+svn:date
+V 27
+2010-11-26T18:01:19.075874Z
+PROPS-END
+
+Node-path: branches/branch
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 5
+Node-copyfrom-path: trunk
+
+
+Node-path: branches/branch/d2/c
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 2
+Text-content-md5: 2cd6ee2c70b0bde53fbe6cac3c8b8bb1
+Text-content-sha1: 2b66fd261ee5c6cfc8de7fa466bab600bcfe4f69
+Content-length: 12
+
+PROPS-END
+c
+
+
+Node-path: branches/branch/d2/b
+Node-action: delete
+
+
+Revision-number: 7
+Prop-content-length: 109
+Content-length: 109
+
+K 7
+svn:log
+V 10
+clobberdir
+K 10
+svn:author
+V 4
+evil
+K 8
+svn:date
+V 27
+2010-11-26T18:01:21.202158Z
+PROPS-END
+
+Node-path: trunk/d2
+Node-kind: dir
+Node-action: delete
+
+Node-path: trunk/d2
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 6
+Node-copyfrom-path: branches/branch/d2
+
+
+
+