Mercurial > hgsubversion
view tests/fixtures/copybeforeclose.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 | 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