Mercurial > hgsubversion
view tests/fixtures/propset-branch.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 | e2c3349b2cca |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 6506bfb9-9ce8-4b91-8357-4dc8bef2ecc6 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-07-10T11:55:08.483993Z PROPS-END Revision-number: 1 Prop-content-length: 122 Content-length: 122 K 7 svn:log V 21 create initial layout K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-07-10T11:55:57.419315Z 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: 111 Content-length: 111 K 7 svn:log V 10 add a file K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-07-10T11:56:54.708286Z PROPS-END Node-path: trunk/a.txt Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 0 Text-content-md5: d41d8cd98f00b204e9800998ecf8427e Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709 Content-length: 10 PROPS-END Revision-number: 3 Prop-content-length: 116 Content-length: 116 K 7 svn:log V 15 create a branch K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-07-10T11:57:29.710978Z PROPS-END Node-path: branches/the-branch Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk Revision-number: 4 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 14 set a property K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-07-10T11:58:41.440627Z PROPS-END Node-path: branches/the-branch Node-kind: dir Node-action: change Prop-content-length: 42 Content-length: 42 K 12 the-property V 9 something PROPS-END