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 unorderedbranch.svndump
#

mkdir temp
cd temp

mkdir project-orig
cd project-orig
mkdir trunk
mkdir branches
cd ..

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

svn co $svnurl project
cd project/trunk
echo a > a
svn add a
svn ci -m "add a in trunk"
echo b > b
echo z > z
svn add b z
svn ci -m "add b and z in trunk"
svn up
cd ../branches
# Copy from trunk past revision. The converted used to take the last
# trunk revision as branch parent instead of the specified one.
svn cp -r 2 ../trunk branch
svn cp ../trunk/z branch
echo c > branch/c
svn add branch/c
svn ci -m 'branch and add c'
cd ../..

svnadmin dump testrepo > ../unorderedbranch.svndump