view tests/fixtures/branch_prop_edit.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 cf6fe8457570
children
line wrap: on
line source

#!/bin/sh
mkdir temp
cd temp
svnadmin create repo
svn co file://`pwd`/repo wc
cd wc
mkdir branches trunk
svn add *
svn ci -m 'branches trunk'
svn up

cd trunk
for a in alpha beta gamma ; do
    echo $a > $a
    svn add $a
done
svn ci -m 'Files.'
cd ..
svn up

svn cp trunk branches/dev_branch
svn ci -m 'make a branch'
svn up

cd branches/dev_branch
echo epsilon > epsilon
svn add epsilon
svn ci -m 'Add a file on the branch.'
svn up
cd ../..

cd branches/dev_branch
svn ps 'svn:ignore' 'delta' .
svn ci -m 'Commit bogus propchange.'
svn up
cd ../../..

pwd
svnadmin dump repo > ../branch_prop_edit.svndump
cd ..
echo 'Dump created in branch_prop_edit.svndump. You can probably delete temp.'
exit 0