view tests/fixtures/copybeforeclose.svndump @ 920:1be4ea4f3c0d

stupid: diff with the good revision when restoring branch Converting history like: r1 create trunk r2 remove trunk r3 make some unrelated commit r4 restore trunk from r2 stupid mode would retrieve and apply the diff with r3 instead of the one with r2. All the code deciding r2 is the actual parent was already there, only the revision argument was not passed. This fixes: - test_delete_restore_trunk in comprehensive/test_stupid_pull.py - test_delete_restore_trunk_stupid in comprehensive/test_verify_and_startrev.py Tested on OSX 10.6 with macports svn-1.7.5. I can no longer test with svn-1.6.
author Patrick Mezard <patrick@mezard.eu>
date Sun, 29 Jul 2012 13:13:56 +0200
parents 1b9d004a8c0a
children
line wrap: on
line source

SVN-fs-dump-format-version: 2

UUID: 1e1f7d3f-4361-4205-84f8-c0d471d161d2

Revision-number: 0
Prop-content-length: 56
Content-length: 56

K 8
svn:date
V 27
2009-06-11T15:51:46.768965Z
PROPS-END

Revision-number: 1
Prop-content-length: 100
Content-length: 100

K 7
svn:log
V 3
btt
K 10
svn:author
V 3
djc
K 8
svn:date
V 27
2009-06-11T15:51:47.134555Z
PROPS-END

Node-path: branches
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Node-path: tags
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Node-path: trunk
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Revision-number: 2
Prop-content-length: 106
Content-length: 106

K 7
svn:log
V 9
Add file.
K 10
svn:author
V 3
djc
K 8
svn:date
V 27
2009-06-11T15:51:48.129578Z
PROPS-END

Node-path: trunk/a
Node-kind: file
Node-action: add
Prop-content-length: 10
Text-content-length: 2
Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
Content-length: 12

PROPS-END
a


Revision-number: 3
Prop-content-length: 104
Content-length: 104

K 7
svn:log
V 7
Branch.
K 10
svn:author
V 3
djc
K 8
svn:date
V 27
2009-06-11T15:51:51.120532Z
PROPS-END

Node-path: branches/test
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 2
Node-copyfrom-path: trunk


Revision-number: 4
Prop-content-length: 113
Content-length: 113

K 7
svn:log
V 15
Move on branch.
K 10
svn:author
V 3
djc
K 8
svn:date
V 27
2009-06-11T15:51:54.124503Z
PROPS-END

Node-path: branches/test/b
Node-kind: file
Node-action: add
Node-copyfrom-rev: 3
Node-copyfrom-path: branches/test/a
Text-copy-source-md5: 60b725f10c9c85c70d97880dfe8191b3


Node-path: branches/test/a
Node-action: delete


Revision-number: 5
Prop-content-length: 111
Content-length: 111

K 7
svn:log
V 13
Close branch.
K 10
svn:author
V 3
djc
K 8
svn:date
V 27
2009-06-11T15:51:57.130547Z
PROPS-END

Node-path: branches/test
Node-action: delete