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.

#!/bin/sh
#
# Generate revert.svndump
#

rm -rf temp
mkdir temp
cd temp
mkdir -p import/trunk/dir
cd import/trunk
echo a > a
echo b > dir/b
cd ../..

svnadmin create testrepo
svnurl=file://`pwd`/testrepo
svn import import $svnurl -m init

svn co $svnurl project
cd project
echo a >> trunk/a
echo b >> trunk/dir/b
svn ci -m changefiles
svn up
# Test directory revert
svn rm trunk
svn cp $svnurl/trunk@1 trunk
svn st
svn ci -m revert
svn up
# Test file revert
svn rm trunk/a
svn rm trunk/dir/b
svn cp $svnurl/trunk/a@2 trunk/a
svn cp $svnurl/trunk/dir/b@2 trunk/dir/b
svn ci -m revert2
cd ..

svnadmin dump testrepo > ../revert.svndump