Mercurial > hgsubversion
view tests/fixtures/siblingbranchfix.svndump @ 1229:46523cdfd3b0 stable 1.6.3
pushmod: prepend "link " to base text for links
http://svn.apache.org/viewvc?view=revision&revision=1223036 exposes
what is arguably a bug in hgsubversion push code. Specifically, when
we are receiving text from the server in an editor, we prepend a "link
" to the text of symlinks when opening a file and strip it when
closing a file. We don't, however, prepend "link " to the base we use
when sending text changes to the server.
This was working before because prior to that revision, the first
thing subversion did was to check whether the entirety of the before
text or the entirety of the after text was less than 64 bytes. In
that case, it just sent the entirety of the after text as a single
insert operation. I'd expect most, but not all symlinks to fit under
the 64 byte limit, including the leading "link " text on the
subversion end.
After the change, the first thing subversion does is check for a
leading match that is more than 4 bytes long, or that is the full
length of the after text. In this case, it sends a copy operation for
the leading match, and then goes into the if < 64 bytes remaining send
the whole thing behavior. It also looks for trailing matches of more
than 4 bytes even in the <64 byte case, but that's not what breaks the
tests.
Incidentally, changing the destination of long symlinks was broken
even before this subversion change. This diff includes test additions
that cover that breakage.
| author | David Schleimer <dschleimer@gmail.com> |
|---|---|
| date | Thu, 07 Aug 2014 19:30:26 -0700 |
| parents | 41c333473dda |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 380991ed-036e-45db-832e-7a8ca661c4f0 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2009-09-19T07:20:51.801386Z 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-09-19T07:20:52.057610Z 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-09-19T07:20:53.056417Z 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: 3 Prop-content-length: 122 Content-length: 122 K 7 svn:log V 24 Branch to repo root dir. K 10 svn:author V 3 djc K 8 svn:date V 27 2009-09-19T07:20:56.043593Z PROPS-END Node-path: wrongbranch Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk Revision-number: 4 Prop-content-length: 138 Content-length: 138 K 7 svn:log V 40 Move branch to correct branches location K 10 svn:author V 3 djc K 8 svn:date V 27 2009-09-19T07:20:59.045512Z PROPS-END Node-path: branches/wrongbranch Node-kind: dir Node-action: add Node-copyfrom-rev: 3 Node-copyfrom-path: wrongbranch Node-path: wrongbranch Node-action: delete