Mercurial > hgsubversion
view tests/fixtures/test_files_copied_from_outside_btt.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 | 496c0354019c |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: df2126f7-00ab-4d49-b42c-7e981dde0bcf Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2008-10-07T22:49:12.059692Z PROPS-END Revision-number: 1 Prop-content-length: 111 Content-length: 111 K 7 svn:log V 11 Empty dirs. K 10 svn:author V 5 durin K 8 svn:date V 27 2008-10-07T22:49:41.118037Z 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: 108 Content-length: 108 K 7 svn:log V 9 Add alpha K 10 svn:author V 5 durin K 8 svn:date V 27 2008-10-07T23:23:02.991743Z PROPS-END Node-path: trunk/alpha Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 12 Text-content-md5: 3c72ebf8bbd7fa88b1fdcee5398b5a17 Content-length: 22 PROPS-END file: alpha Revision-number: 3 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 15 Add third_party K 10 svn:author V 5 durin K 8 svn:date V 27 2008-10-27T03:16:13.831333Z PROPS-END Node-path: third_party Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: third_party/magic Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: third_party/magic/the_magic_software Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 7 Text-content-md5: bc82cb068ef102a1f4e296992e5979ef Content-length: 17 PROPS-END magic! Revision-number: 4 Prop-content-length: 131 Content-length: 131 K 7 svn:log V 31 Copy magic in from third_party. K 10 svn:author V 5 durin K 8 svn:date V 27 2008-10-27T03:16:32.737023Z PROPS-END Node-path: trunk/magic Node-kind: dir Node-action: add Node-copyfrom-rev: 3 Node-copyfrom-path: third_party/magic Prop-content-length: 34 Content-length: 34 K 13 svn:mergeinfo V 0 PROPS-END