Mercurial > hgsubversion
view tests/fixtures/rename_branch_parent_dir.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 | d17cec76e769 |
children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: dceec716-b592-46cb-b5fe-41acbbe32b85 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-02-06T17:32:02.297006Z PROPS-END Revision-number: 1 Prop-content-length: 102 Content-length: 102 K 7 svn:log V 3 btt K 10 svn:author V 5 augie K 8 svn:date V 27 2010-02-06T17:32:03.176895Z PROPS-END Node-path: brances 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: 110 Content-length: 110 K 7 svn:log V 10 Add files. K 10 svn:author V 5 augie K 8 svn:date V 27 2010-02-06T17:32:04.202558Z PROPS-END Node-path: trunk/alpha Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 6 Text-content-md5: 9f9f90dbe3e5ee1218c86b8839db1995 Content-length: 16 PROPS-END alpha Node-path: trunk/beta Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 5 Text-content-md5: f0cf2a92516045024a0c99147b28f05b Content-length: 15 PROPS-END beta Node-path: trunk/delta Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 6 Text-content-md5: d2840cc81bc032bd1141b56687d0f93c Content-length: 16 PROPS-END delta Node-path: trunk/gamma Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 6 Text-content-md5: 303febb9068384eca46b5b6516843b35 Content-length: 16 PROPS-END gamma Revision-number: 3 Prop-content-length: 105 Content-length: 105 K 7 svn:log V 6 branch K 10 svn:author V 5 augie K 8 svn:date V 27 2010-02-06T17:32:07.137254Z PROPS-END Node-path: brances/dev_branch Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk Revision-number: 4 Prop-content-length: 114 Content-length: 114 K 7 svn:log V 14 branch changes K 10 svn:author V 5 augie K 8 svn:date V 27 2010-02-06T17:32:08.190998Z PROPS-END Node-path: brances/dev_branch/alpha Node-kind: file Node-action: change Text-content-length: 5 Text-content-md5: 5e723ed52db2000686425ca28bc5ba4a Content-length: 5 narf Node-path: brances/dev_branch/iota Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 5 Text-content-md5: ebcf3971120220589f1dfbf8d56e25b9 Content-length: 15 PROPS-END iota Node-path: brances/dev_branch/delta Node-action: delete Revision-number: 5 Prop-content-length: 125 Content-length: 125 K 7 svn:log V 25 move branches to branches K 10 svn:author V 5 augie K 8 svn:date V 27 2010-02-06T17:32:11.150006Z PROPS-END Node-path: branches Node-kind: dir Node-action: add Node-copyfrom-rev: 4 Node-copyfrom-path: brances Node-path: brances Node-action: delete