view tests/fixtures/branch_delete_parent_dir.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 45df4d9320fa
children
line wrap: on
line source

SVN-fs-dump-format-version: 2

UUID: 60132d6f-a460-4b38-8ae6-633264894f73

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

K 8
svn:date
V 27
2009-06-30T23:57:20.562207Z
PROPS-END

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

K 7
svn:log
V 3
btt
K 10
svn:author
V 4
maxb
K 8
svn:date
V 27
2009-06-30T23:57:21.078798Z
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 8
add file
K 10
svn:author
V 4
maxb
K 8
svn:date
V 27
2009-06-30T23:57:22.098826Z
PROPS-END

Node-path: trunk/foo
Node-kind: file
Node-action: add
Prop-content-length: 10
Text-content-length: 4
Text-content-md5: d3b07384d113edec49eaa6238ad5ff00
Text-content-sha1: f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
Content-length: 14

PROPS-END
foo


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

K 7
svn:log
V 6
branch
K 10
svn:author
V 4
maxb
K 8
svn:date
V 27
2009-06-30T23:57:25.055724Z
PROPS-END

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


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

K 7
svn:log
V 19
delete branches dir
K 10
svn:author
V 4
maxb
K 8
svn:date
V 27
2009-06-30T23:57:27.072926Z
PROPS-END

Node-path: branches
Node-action: delete