Mercurial > hgsubversion
view tests/fixtures/branch_delete_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 | 45df4d9320fa |
children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 60132d6f-a460-4b38-8ae6-633264894f73 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2009-06-30T23:57:20.562207Z PROPS-END Revision-number: 1 Prop-content-length: 101 Content-length: 101 K 7 svn:log V 3 btt K 10 svn:author V 4 maxb K 8 svn:date V 27 2009-06-30T23:57:21.078798Z 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 8 add file K 10 svn:author V 4 maxb K 8 svn:date V 27 2009-06-30T23:57:22.098826Z PROPS-END Node-path: trunk/foo Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 4 Text-content-md5: d3b07384d113edec49eaa6238ad5ff00 Text-content-sha1: f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 Content-length: 14 PROPS-END foo Revision-number: 3 Prop-content-length: 104 Content-length: 104 K 7 svn:log V 6 branch K 10 svn:author V 4 maxb K 8 svn:date V 27 2009-06-30T23:57:25.055724Z PROPS-END Node-path: branches/dev_branch Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk Revision-number: 4 Prop-content-length: 118 Content-length: 118 K 7 svn:log V 19 delete branches dir K 10 svn:author V 4 maxb K 8 svn:date V 27 2009-06-30T23:57:27.072926Z PROPS-END Node-path: branches Node-action: delete