Mercurial > hgsubversion
view tests/fixtures/propset-branch.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 | e2c3349b2cca |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 6506bfb9-9ce8-4b91-8357-4dc8bef2ecc6 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-07-10T11:55:08.483993Z PROPS-END Revision-number: 1 Prop-content-length: 122 Content-length: 122 K 7 svn:log V 21 create initial layout K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-07-10T11:55:57.419315Z 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: 111 Content-length: 111 K 7 svn:log V 10 add a file K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-07-10T11:56:54.708286Z PROPS-END Node-path: trunk/a.txt Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 0 Text-content-md5: d41d8cd98f00b204e9800998ecf8427e Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709 Content-length: 10 PROPS-END Revision-number: 3 Prop-content-length: 116 Content-length: 116 K 7 svn:log V 15 create a branch K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-07-10T11:57:29.710978Z PROPS-END Node-path: branches/the-branch Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk Revision-number: 4 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 14 set a property K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-07-10T11:58:41.440627Z PROPS-END Node-path: branches/the-branch Node-kind: dir Node-action: change Prop-content-length: 42 Content-length: 42 K 12 the-property V 9 something PROPS-END