Mercurial > hgsubversion
view tests/fixtures/subdir_is_file_prefix.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 | c6388ed0ec0a |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 924a052a-5e5a-4a8e-a677-da5565bec340 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2011-03-04T12:33:29.342045Z PROPS-END Revision-number: 1 Prop-content-length: 123 Content-length: 123 K 7 svn:log V 22 Create directory flaf. K 10 svn:author V 6 danchr K 8 svn:date V 27 2011-03-04T12:34:00.349950Z PROPS-END Node-path: flaf Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Revision-number: 2 Prop-content-length: 138 Content-length: 138 K 7 svn:log V 37 Create the file flaf.txt within flaf. K 10 svn:author V 6 danchr K 8 svn:date V 27 2011-03-04T12:45:01.701033Z PROPS-END Node-path: flaf/flaf.txt Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 15 Text-content-md5: 8c0059c8f7998e8003836b8e8fcb74d7 Text-content-sha1: b7d680bc5411f46395c4ef267001e1a307d7b0d5 Content-length: 25 PROPS-END Goodbye world.