Mercurial > hgsubversion
view tests/fixtures/emptyrepo2.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 | f9014e28721b |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 293d1f29-635d-48b8-9cdf-468fd987067a Revision-number: 0 Prop-content-length: 261 Content-length: 261 K 8 svn:date V 27 2012-10-03T18:58:42.535317Z K 17 svn:sync-from-url V 74 file:///Users/pmezard/dev/hg/hgsubversion/tests/fixtures/temp/testrepo/sub K 18 svn:sync-from-uuid V 36 241badf9-093f-4e71-8a58-1028abf52758 K 24 svn:sync-last-merged-rev V 1 4 PROPS-END Revision-number: 1 Prop-content-length: 105 Content-length: 105 K 10 svn:author V 7 pmezard K 8 svn:date V 27 2012-10-03T18:58:42.556405Z K 7 svn:log V 4 init PROPS-END Node-path: sub Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: sub/trunk Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Revision-number: 2 Prop-content-length: 107 Content-length: 107 K 10 svn:author V 7 pmezard K 8 svn:date V 27 2012-10-03T18:58:43.040912Z K 7 svn:log V 6 othera PROPS-END Revision-number: 3 Prop-content-length: 108 Content-length: 108 K 10 svn:author V 7 pmezard K 8 svn:date V 27 2012-10-03T18:58:44.042124Z K 7 svn:log V 7 othera2 PROPS-END Revision-number: 4 Prop-content-length: 105 Content-length: 105 K 10 svn:author V 7 pmezard K 8 svn:date V 27 2012-10-03T18:58:45.053459Z K 7 svn:log V 4 adda PROPS-END Node-path: sub/trunk/a Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 3b5d5c3712955042212316173ccf37be Text-content-sha1: 89e6c98d92887913cadf06b2adb97f26cde4849b Content-length: 12 PROPS-END b