Mercurial > hgsubversion
view tests/fixtures/pushexternals.svndump @ 1340:db9d85618d3d
wrapper: delay marker creation in push
Before this patch we were creating obsolescence markers when pulling the
changesets from subversion. The counterpart stripping logic (when obsolescence
is not available) was done after pushing everything.
This patch moves the marker creation to the end of the push, to:
1) Make the code more readable (the marker creation and the stripping should
be in the same place)
2) Fix a behavior issue with inhibit(evolve) (see below)
With inhibit + hgsubversion enabled. When pushing to subversion we were
creating markers as expected but inhibiting the marker on the commit that was
the parent of the working copy making it therefore visible.
By delaying the marker creation to after the update we avoid this issue.
| author | Laurent Charignon <lcharignon@fb.com> |
|---|---|
| date | Wed, 08 Jul 2015 13:30:16 -0700 |
| parents | 2412800b1258 |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: ce6cbbbe-6533-4ba7-91e1-cc165717826f Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2008-12-27T19:48:52.687312Z PROPS-END Revision-number: 1 Prop-content-length: 114 Content-length: 114 K 7 svn:log V 12 init project K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-12-27T19:48:52.751303Z PROPS-END Node-path: externals 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: 130 Content-length: 130 K 7 svn:log V 28 configure externals projects K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-12-27T19:48:53.230452Z PROPS-END Node-path: externals/project1 Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: externals/project1/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: externals/project2 Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: externals/project2/b Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3 Content-length: 12 PROPS-END a Revision-number: 3 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 13 add a and dir K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-12-27T19:48:54.187575Z PROPS-END Node-path: 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: trunk/dir Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Revision-number: 4 Prop-content-length: 109 Content-length: 109 K 7 svn:log V 8 remove a K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-12-27T19:48:55.175595Z PROPS-END Node-path: trunk/a Node-action: delete