Mercurial > hgsubversion
view tests/fixtures/commit-to-tag.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 | 9e6499c415a9 |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: af82cc90-c2d2-43cd-b1aa-c8a78449440a Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2009-06-24T02:53:15.860217Z PROPS-END Revision-number: 1 Prop-content-length: 102 Content-length: 102 K 7 svn:log V 3 btt K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-24T02:53:17.530891Z PROPS-END Node-path: branches Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: branches/magic 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: 114 Content-length: 114 K 7 svn:log V 14 Add file alpha K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-24T02:53:18.122469Z PROPS-END Node-path: branches/magic/alpha Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 6 Text-content-md5: 9f9f90dbe3e5ee1218c86b8839db1995 Content-length: 16 PROPS-END alpha Revision-number: 3 Prop-content-length: 113 Content-length: 113 K 7 svn:log V 13 Add file beta K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-24T02:53:19.101676Z PROPS-END Node-path: branches/magic/beta Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 5 Text-content-md5: f0cf2a92516045024a0c99147b28f05b Content-length: 15 PROPS-END beta Revision-number: 4 Prop-content-length: 114 Content-length: 114 K 7 svn:log V 14 Add file gamma K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-24T02:53:20.081433Z PROPS-END Node-path: branches/magic/gamma Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 6 Text-content-md5: 303febb9068384eca46b5b6516843b35 Content-length: 16 PROPS-END gamma Revision-number: 5 Prop-content-length: 116 Content-length: 116 K 7 svn:log V 16 Make tag to edit K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-24T02:53:22.103708Z PROPS-END Node-path: tags/will-edit Node-kind: dir Node-action: add Node-copyfrom-rev: 4 Node-copyfrom-path: branches/magic Revision-number: 6 Prop-content-length: 114 Content-length: 114 K 7 svn:log V 14 Add file delta K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-24T02:53:23.077083Z PROPS-END Node-path: branches/magic/delta Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 6 Text-content-md5: d2840cc81bc032bd1141b56687d0f93c Content-length: 16 PROPS-END delta Revision-number: 7 Prop-content-length: 113 Content-length: 113 K 7 svn:log V 13 Add file iota K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-24T02:53:24.107494Z PROPS-END Node-path: branches/magic/iota Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 5 Text-content-md5: ebcf3971120220589f1dfbf8d56e25b9 Content-length: 15 PROPS-END iota Revision-number: 8 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 15 Add file lambda K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-24T02:53:25.092428Z PROPS-END Node-path: branches/magic/lambda Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 7 Text-content-md5: 8c8a4646591ee0d9a43d3149320ed577 Content-length: 17 PROPS-END lambda Revision-number: 9 Prop-content-length: 151 Content-length: 151 K 7 svn:log V 51 removed alpha on a tag. Moves tag, implicit branch. K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-24T02:53:26.443673Z PROPS-END Node-path: tags/will-edit/alpha Node-action: delete Revision-number: 10 Prop-content-length: 114 Content-length: 114 K 7 svn:log V 14 Add file omega K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-24T02:53:27.067556Z PROPS-END Node-path: branches/magic/omega Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 6 Text-content-md5: 14723c69541ee556d75c581b787dc217 Content-length: 16 PROPS-END omega Revision-number: 11 Prop-content-length: 116 Content-length: 116 K 7 svn:log V 16 Make tag to edit K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-24T02:53:29.049217Z PROPS-END Node-path: tags/also-edit Node-kind: dir Node-action: add Node-copyfrom-rev: 10 Node-copyfrom-path: branches/magic Revision-number: 12 Prop-content-length: 156 Content-length: 156 K 7 svn:log V 56 edit both the tag and its source branch at the same time K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-24T02:53:30.063026Z PROPS-END Node-path: branches/magic/omega Node-kind: file Node-action: change Text-content-length: 10 Text-content-md5: 9b26a47955b0778e131aae04743f2b8c Content-length: 10 not omega Node-path: tags/also-edit/omega Node-kind: file Node-action: change Text-content-length: 10 Text-content-md5: 9b26a47955b0778e131aae04743f2b8c Content-length: 10 not omega Revision-number: 13 Prop-content-length: 119 Content-length: 119 K 7 svn:log V 19 Edit an edited tag. K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-26T15:28:20.055574Z PROPS-END Node-path: tags/also-edit/omega Node-kind: file Node-action: change Text-content-length: 15 Text-content-md5: a8d56f18cc28a34d6fe2cee5291ac1cc Content-length: 15 more stupidity Revision-number: 14 Prop-content-length: 117 Content-length: 117 K 7 svn:log V 17 Tag an edited tag K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-26T15:57:06.047408Z PROPS-END Node-path: tags/did-edits Node-kind: dir Node-action: add Node-copyfrom-rev: 13 Node-copyfrom-path: tags/also-edit Revision-number: 15 Prop-content-length: 140 Content-length: 140 K 7 svn:log V 40 Make extra branch for another bogus case K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-26T19:26:28.086924Z PROPS-END Node-path: branches/closeme Node-kind: dir Node-action: add Node-copyfrom-rev: 14 Node-copyfrom-path: branches/magic Revision-number: 16 Prop-content-length: 136 Content-length: 136 K 7 svn:log V 36 Make tag to edit after branch closes K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-26T19:26:28.119751Z PROPS-END Node-path: tags/edit-later Node-kind: dir Node-action: add Node-copyfrom-rev: 15 Node-copyfrom-path: branches/closeme Revision-number: 17 Prop-content-length: 116 Content-length: 116 K 7 svn:log V 16 Close the branch K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-29T00:12:57.367624Z PROPS-END Node-path: branches/closeme Node-action: delete Revision-number: 18 Prop-content-length: 137 Content-length: 137 K 7 svn:log V 37 Edit this tag after its parent closed K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-26T19:26:29.059216Z PROPS-END Node-path: tags/edit-later/delta Node-kind: file Node-action: change Text-content-length: 7 Text-content-md5: 5bbd00dab68c937673171d0b2e205c96 Content-length: 7 boofar Revision-number: 19 Prop-content-length: 118 Content-length: 118 K 7 svn:log V 18 Revert revision 9. K 10 svn:author V 5 durin K 8 svn:date V 27 2009-06-29T00:13:01.537589Z PROPS-END Node-path: tags/will-edit/alpha Node-kind: file Node-action: add Node-copyfrom-rev: 8 Node-copyfrom-path: tags/will-edit/alpha Text-copy-source-md5: 9f9f90dbe3e5ee1218c86b8839db1995 Revision-number: 20 Prop-content-length: 153 Content-length: 153 K 7 svn:log V 53 make a tag from a branch and edit it at the same time K 10 svn:author V 5 augie K 8 svn:date V 27 2010-02-06T13:31:13.153406Z PROPS-END Node-path: tags/edit-at-create Node-kind: dir Node-action: add Node-copyfrom-rev: 19 Node-copyfrom-path: branches/magic Node-path: tags/edit-at-create/alpha Node-kind: file Node-action: change Text-content-length: 12 Text-content-md5: 7b77a55a273801087b943dfbe257f4db Content-length: 12 alpha alpha