Mercurial > hgsubversion
view tests/fixtures/siblingbranchfix.svndump @ 991:26e9fd21f3bf
push: avoid rebasing when we know there are no conflicts
When pushing multiple commits, push would do one rebase
per commit. This changes it track the files that have been
changed as part of the push and only perform a rebase if
the commit touches a file that has been changed previously.
On our repo, push used to take 25 seconds per commit. With
this change it takes closer to 10 seconds per commit (if
there are no conflicts).
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Wed, 02 Jan 2013 17:54:30 -0800 |
| parents | 41c333473dda |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 380991ed-036e-45db-832e-7a8ca661c4f0 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2009-09-19T07:20:51.801386Z PROPS-END Revision-number: 1 Prop-content-length: 100 Content-length: 100 K 7 svn:log V 3 btt K 10 svn:author V 3 djc K 8 svn:date V 27 2009-09-19T07:20:52.057610Z 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: 106 Content-length: 106 K 7 svn:log V 9 Add file. K 10 svn:author V 3 djc K 8 svn:date V 27 2009-09-19T07:20:53.056417Z PROPS-END Node-path: trunk/a Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3 Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b Content-length: 12 PROPS-END a Revision-number: 3 Prop-content-length: 122 Content-length: 122 K 7 svn:log V 24 Branch to repo root dir. K 10 svn:author V 3 djc K 8 svn:date V 27 2009-09-19T07:20:56.043593Z PROPS-END Node-path: wrongbranch Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk Revision-number: 4 Prop-content-length: 138 Content-length: 138 K 7 svn:log V 40 Move branch to correct branches location K 10 svn:author V 3 djc K 8 svn:date V 27 2009-09-19T07:20:59.045512Z PROPS-END Node-path: branches/wrongbranch Node-kind: dir Node-action: add Node-copyfrom-rev: 3 Node-copyfrom-path: wrongbranch Node-path: wrongbranch Node-action: delete