Mercurial > hgsubversion
view tests/fixtures/subdir_is_file_prefix.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 | c6388ed0ec0a |
children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 924a052a-5e5a-4a8e-a677-da5565bec340 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2011-03-04T12:33:29.342045Z PROPS-END Revision-number: 1 Prop-content-length: 123 Content-length: 123 K 7 svn:log V 22 Create directory flaf. K 10 svn:author V 6 danchr K 8 svn:date V 27 2011-03-04T12:34:00.349950Z PROPS-END Node-path: flaf Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Revision-number: 2 Prop-content-length: 138 Content-length: 138 K 7 svn:log V 37 Create the file flaf.txt within flaf. K 10 svn:author V 6 danchr K 8 svn:date V 27 2011-03-04T12:45:01.701033Z PROPS-END Node-path: flaf/flaf.txt Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 15 Text-content-md5: 8c0059c8f7998e8003836b8e8fcb74d7 Text-content-sha1: b7d680bc5411f46395c4ef267001e1a307d7b0d5 Content-length: 25 PROPS-END Goodbye world.