view tests/fixtures/branch_from_tag.svndump @ 1028:c4b25a903ad3

layouts: consistently return None for default branch This makes the single and standard layouts consistent in what they return for the default branch. Previously, single had returned 'default' now they both return None. In addition, this fixes a now-exposed bug in stupid's convert_revision logic. Specifically, when a file is replaced by another file within the same branch, we treated that as replacing the entire branch. this bug was previously hidden because meta.split_branch_path and meta.localname were inconsistent in what they returned for the single layout. meta.split-branch_path is used to maintain the set of known branches, where meta.localname is used to determine the branch for the path being replaced. This resulted in erroneously hitting the condition that skipped paths outside branches we know about when considering replace operations from svn.
author David Schleimer <dschleimer@fb.com>
date Wed, 05 Jun 2013 11:00:06 -0700
parents 1f8854804795
children
line wrap: on
line source

SVN-fs-dump-format-version: 2

UUID: df2126f7-00ab-4d49-b42c-7e981dde0bcf

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

K 8
svn:date
V 27
2008-10-07T22:49:12.059692Z
PROPS-END

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

K 7
svn:log
V 11
Empty dirs.
K 10
svn:author
V 5
durin
K 8
svn:date
V 27
2008-10-07T22:49:41.118037Z
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: 108
Content-length: 108

K 7
svn:log
V 9
Add alpha
K 10
svn:author
V 5
durin
K 8
svn:date
V 27
2008-10-07T23:23:02.991743Z
PROPS-END

Node-path: trunk/alpha
Node-kind: file
Node-action: add
Prop-content-length: 10
Text-content-length: 12
Text-content-md5: 3c72ebf8bbd7fa88b1fdcee5398b5a17
Content-length: 22

PROPS-END
file: alpha


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

K 7
svn:log
V 8
Add beta
K 10
svn:author
V 5
durin
K 8
svn:date
V 27
2008-10-07T23:28:22.651398Z
PROPS-END

Node-path: trunk/beta
Node-kind: file
Node-action: add
Prop-content-length: 10
Text-content-length: 13
Text-content-md5: 981d1eb5fd0bbe05354c292105944863
Content-length: 23

PROPS-END
Data of beta


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

K 7
svn:log
V 10
tagging r3
K 10
svn:author
V 5
durin
K 8
svn:date
V 27
2008-10-08T23:18:29.837825Z
PROPS-END

Node-path: tags/tag_r3
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 3
Node-copyfrom-path: trunk
Prop-content-length: 34
Content-length: 34

K 13
svn:mergeinfo
V 0

PROPS-END


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

K 7
svn:log
V 14
tag from a tag
K 10
svn:author
V 5
durin
K 8
svn:date
V 27
2008-10-08T23:18:51.091356Z
PROPS-END

Node-path: tags/copied_tag
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 4
Node-copyfrom-path: tags/tag_r3


Revision-number: 6
Prop-content-length: 125
Content-length: 125

K 7
svn:log
V 25
Make a branch from a tag.
K 10
svn:author
V 5
durin
K 8
svn:date
V 27
2008-10-09T00:07:48.076984Z
PROPS-END

Node-path: branches/branch_from_tag
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 5
Node-copyfrom-path: tags/tag_r3