Mercurial > hgsubversion
view tests/fixtures/simple_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 | bb00f7ca5b8c |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 3cd547df-371e-4add-bccf-aba732a2baf5 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-02-02T21:54:11.642093Z 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 2010-02-02T21:54:11.673761Z 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 2010-02-02T21:54:12.073120Z PROPS-END Node-path: trunk/alpha Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 12 Text-content-md5: 3c72ebf8bbd7fa88b1fdcee5398b5a17 Text-content-sha1: f552a50b53177d35b29a4a0ab1cece918b5b5e9b Content-length: 22 PROPS-END file: alpha Revision-number: 3 Prop-content-length: 107 Content-length: 107 K 7 svn:log V 8 Add beta K 10 svn:author V 5 durin K 8 svn:date V 27 2010-02-02T21:54:13.096862Z PROPS-END Node-path: trunk/beta Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 13 Text-content-md5: 981d1eb5fd0bbe05354c292105944863 Text-content-sha1: 5d40e0a9ceda69f3d98d4851a6bee02c10a6e277 Content-length: 23 PROPS-END Data of beta Revision-number: 4 Prop-content-length: 113 Content-length: 113 K 7 svn:log V 13 Make a branch K 10 svn:author V 5 durin K 8 svn:date V 27 2010-02-02T21:54:16.042325Z PROPS-END Node-path: branches/the_branch Node-kind: dir Node-action: add Node-copyfrom-rev: 3 Node-copyfrom-path: trunk