Mercurial > hgsubversion
view tests/fixtures/propset-branch.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 | e2c3349b2cca |
children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 6506bfb9-9ce8-4b91-8357-4dc8bef2ecc6 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-07-10T11:55:08.483993Z PROPS-END Revision-number: 1 Prop-content-length: 122 Content-length: 122 K 7 svn:log V 21 create initial layout K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-07-10T11:55:57.419315Z 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: 111 Content-length: 111 K 7 svn:log V 10 add a file K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-07-10T11:56:54.708286Z PROPS-END Node-path: trunk/a.txt Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 0 Text-content-md5: d41d8cd98f00b204e9800998ecf8427e Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709 Content-length: 10 PROPS-END Revision-number: 3 Prop-content-length: 116 Content-length: 116 K 7 svn:log V 15 create a branch K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-07-10T11:57:29.710978Z PROPS-END Node-path: branches/the-branch Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk Revision-number: 4 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 14 set a property K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-07-10T11:58:41.440627Z PROPS-END Node-path: branches/the-branch Node-kind: dir Node-action: change Prop-content-length: 42 Content-length: 42 K 12 the-property V 9 something PROPS-END