Mercurial > hgsubversion
view tests/fixtures/replace_branch_with_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 | 2723152c8111 |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 6c4a9db2-8b38-4988-bc82-df1f3bb0afcd Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-03-01T23:13:19.505202Z PROPS-END Revision-number: 1 Prop-content-length: 108 Content-length: 108 K 7 svn:log V 7 initial K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-03-01T23:13:20.066689Z PROPS-END Node-path: branches 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 Node-path: trunk/a Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3 Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b Content-length: 12 PROPS-END a Revision-number: 2 Prop-content-length: 108 Content-length: 108 K 7 svn:log V 7 branch1 K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-03-01T23:13:23.056920Z PROPS-END Node-path: branches/branch1 Node-kind: dir Node-action: add Node-copyfrom-rev: 1 Node-copyfrom-path: trunk Revision-number: 3 Prop-content-length: 118 Content-length: 118 K 7 svn:log V 16 add b to branch1 K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-03-01T23:13:25.099593Z PROPS-END Node-path: branches/branch1/b 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 Node-path: branches/branch1/d Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: e29311f6f1bf1af907f9ef9f44b8328b Text-content-sha1: e983f374794de9c64e3d1c1de1d490c0756eeeff Content-length: 12 PROPS-END d Node-path: branches/branch1/dir Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: branches/branch1/dir/e Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 9ffbf43126e33be52cd2bf7e01d627f9 Text-content-sha1: 094e3afb2fe8dfe82f63731cdcd3b999f4856cff Content-length: 12 PROPS-END e Node-path: branches/branch1/f Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 9a8ad92c50cae39aa2c5604fd0ab6d8c Text-content-sha1: a9fcd54b25e7e863d72cd47c08af46e61b74b561 Content-length: 12 PROPS-END f Node-path: branches/branch1/g Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: f5302386464f953ed581edac03556e55 Text-content-sha1: a5938ace3f424be1a26904781cdb06d55b614e6b Content-length: 12 PROPS-END g Revision-number: 4 Prop-content-length: 108 Content-length: 108 K 7 svn:log V 7 branch2 K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-03-01T23:13:27.051018Z PROPS-END Node-path: branches/branch2 Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk Revision-number: 5 Prop-content-length: 118 Content-length: 118 K 7 svn:log V 16 add c to branch2 K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-03-01T23:13:29.108780Z PROPS-END Node-path: branches/branch2/c Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 2cd6ee2c70b0bde53fbe6cac3c8b8bb1 Text-content-sha1: 2b66fd261ee5c6cfc8de7fa466bab600bcfe4f69 Content-length: 12 PROPS-END c Node-path: branches/branch2/dir Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: branches/branch2/dir/e Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 3 Text-content-md5: c18e1214a2500c0c3636092222f8a850 Text-content-sha1: 4a078b075f259063b9a730521378f70ec3223238 Content-length: 13 PROPS-END e2 Node-path: branches/branch2/f Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 3 Text-content-md5: 575c5638d60271457e54ab7d07309502 Text-content-sha1: 1c49a440c352f3473efa9512255033b94dc7def0 Content-length: 13 PROPS-END f2 Revision-number: 6 Prop-content-length: 102 Content-length: 102 K 7 svn:log V 4 blah K 10 svn:author V 4 evil K 8 svn:date V 27 2010-03-01T23:13:31.520483Z PROPS-END Node-path: branches/branch1 Node-kind: dir Node-action: delete Node-path: branches/branch1 Node-kind: dir Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: branches/branch2 Node-path: branches/branch1/a Node-kind: file Node-action: delete Node-path: branches/branch1/a Node-kind: file Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: branches/branch1/d Text-copy-source-md5: e29311f6f1bf1af907f9ef9f44b8328b Text-copy-source-sha1: e983f374794de9c64e3d1c1de1d490c0756eeeff Node-path: branches/branch1/dir Node-kind: dir Node-action: delete Node-path: branches/branch1/dir Node-kind: dir Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: branches/branch1/dir Node-path: branches/branch1/dir2 Node-kind: dir Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: branches/branch1/dir Node-path: branches/branch1/f Node-kind: file Node-action: delete Node-path: branches/branch1/f Node-kind: file Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: branches/branch1/f Text-copy-source-md5: 9a8ad92c50cae39aa2c5604fd0ab6d8c Text-copy-source-sha1: a9fcd54b25e7e863d72cd47c08af46e61b74b561 Node-path: branches/branch1/g Node-kind: file Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: branches/branch1/g Text-copy-source-md5: f5302386464f953ed581edac03556e55 Text-copy-source-sha1: a5938ace3f424be1a26904781cdb06d55b614e6b