Mercurial > hgsubversion
view tests/fixtures/non_ascii_path_2.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 | ae5968ffe6fe |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: a7b92ce5-70a8-4e75-99da-c3ca360ae490 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-08-16T13:08:38.494252Z PROPS-END Revision-number: 1 Prop-content-length: 121 Content-length: 121 K 7 svn:log V 20 Create project bøb. K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-08-16T13:10:12.395716Z PROPS-END Node-path: bøb Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: bøb/branches Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: bøb/tags Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: bøb/trunk Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: bøb/trunk/A Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 1 Text-content-md5: 68b329da9893e34099c7d8ad5cb9c940 Text-content-sha1: adc83b19e793491b1c6ea0fd8b46cd9f32e592fc Content-length: 11 PROPS-END Revision-number: 2 Prop-content-length: 112 Content-length: 112 K 7 svn:log V 11 Add a file. K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-08-16T14:04:00.624391Z PROPS-END Node-path: bøb/trunk/B Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 1 Text-content-md5: 68b329da9893e34099c7d8ad5cb9c940 Text-content-sha1: adc83b19e793491b1c6ea0fd8b46cd9f32e592fc Content-length: 11 PROPS-END