Mercurial > hgsubversion
view tests/fixtures/delentries.sh @ 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 | 19aabf67c792 |
children |
line wrap: on
line source
#!/bin/sh # # Generate delentries.svndump # mkdir temp cd temp mkdir project-orig cd project-orig mkdir trunk cd .. svnadmin create testrepo svnurl=file://`pwd`/testrepo svn import project-orig $svnurl -m "init project" svn co $svnurl project cd project/trunk # Regular file deletion echo a > a # Another file starting like the deleted file echo aa > aa mkdir d1 mkdir d1/d2 mkdir d1/d2/d3 echo c > d1/c # Test directory deletion echo d > d1/d2/c # Test subdirectory deletion echo e > d1/d2/d3/e echo f > d1/d2/d3/f # This file starts as the deleted directory, can be confusing echo d2prefix > d1/d2prefix svn add a aa d1 svn ci -m "add entries" svn rm a d1/d2 svn ci -m "remove entries" cd ../.. svnadmin dump testrepo > ../delentries.svndump