Mercurial > hgsubversion
view tests/fixtures/empty_dir_in_trunk_not_repo_root.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 | 6ec5b5fc5b4d |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: c866b883-4c03-404b-8609-dade481701a6 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2009-04-15T03:39:30.544797Z PROPS-END Revision-number: 1 Prop-content-length: 104 Content-length: 104 K 7 svn:log V 5 trunk K 10 svn:author V 5 durin K 8 svn:date V 27 2009-04-15T03:39:31.069518Z PROPS-END Node-path: project Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: project/trunk Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Revision-number: 2 Prop-content-length: 118 Content-length: 118 K 7 svn:log V 18 file and empty dir K 10 svn:author V 5 durin K 8 svn:date V 27 2009-04-15T03:39:32.069497Z PROPS-END Node-path: project/trunk/a Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3 Content-length: 12 PROPS-END a Node-path: project/trunk/narf Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END