Mercurial > hgsubversion
view tests/fixtures/renametagdir.svndump @ 933:a9f315eae67c
push: use native rebase instead of our rebase wrapper
Our rebase wrapper doesn't quite do the right thing with repect to a
just-pushed revision. In particular, it will try to rebase the
just-pushed revision on top of the version of that revision we just
pulled down from svn. This will sometimes result in a local revision
with an identical commit message as the revision from svn, but no file
changes.
This changes the rebase portion of the push command to instead use the
native rebase with a revset that excludes the revision we just pushed
to svn from the set to be rebased. It also moves to a single strip
operation that removes all of the revisions based on a pre-push or
partially pushed revision. This moves to a separate rebase and strip
operation since we now need to strip revisions we are not rebasing.
| author | David Schleimer <dschleimer@fb.com> |
|---|---|
| date | Mon, 24 Sep 2012 10:18:28 -0700 |
| parents | d380e7e4175a |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: b3e24de6-f874-406f-9561-e48db081ff5e Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-01-20T12:58:05.107637Z PROPS-END Revision-number: 1 Prop-content-length: 104 Content-length: 104 K 7 svn:log V 3 btt K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-20T12:58:06.111903Z 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: 110 Content-length: 110 K 7 svn:log V 9 Add file. K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-20T12:58:07.088858Z 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: 108 Content-length: 108 K 7 svn:log V 7 Branch. K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-20T12:58:10.062719Z 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: 112 Content-length: 112 K 7 svn:log V 10 First tag. K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-20T12:58:12.060717Z PROPS-END Node-path: tags/test-0.1 Node-kind: dir Node-action: add Node-copyfrom-rev: 3 Node-copyfrom-path: branches/test Revision-number: 5 Prop-content-length: 112 Content-length: 112 K 7 svn:log V 10 Weird tag. K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-20T12:58:12.110400Z PROPS-END Node-path: tags/test-0.1/test Node-kind: dir Node-action: add Node-copyfrom-rev: 3 Node-copyfrom-path: branches/test Revision-number: 6 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 13 Fix tag pt 1. K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-20T12:58:12.169328Z PROPS-END Node-path: tags/test-0.1/test Node-action: delete Node-path: tags/test-0.1-real Node-kind: dir Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: tags/test-0.1/test Revision-number: 7 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 13 Remove weird. K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-20T12:58:12.212355Z PROPS-END Node-path: tags/test-0.1 Node-action: delete Revision-number: 8 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 13 Fix tag pt 2. K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-01-20T12:58:12.317421Z PROPS-END Node-path: tags/test-0.1 Node-kind: dir Node-action: add Node-copyfrom-rev: 7 Node-copyfrom-path: tags/test-0.1-real Node-path: tags/test-0.1-real Node-action: delete