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

#!/bin/sh

rm -rf temp
mkdir temp
cd temp
svnadmin create repo
repo=file://`pwd`/repo
svn co $repo wc
cd wc
mkdir branches trunk tags
svn add *
svn ci -m 'btt'

cd trunk
echo trunk1 > file
mkdir dir
echo trunk1 > dir/file
svn add file dir
svn ci -m 'Add file and dir.'
cd ..
svn up

svn cp trunk branches/test
svn ci -m 'Branch.'
svn up

cd branches/test/
echo branch1 > file
echo branch1 > dir/file
svn ci -m 'edit on branch.'
cd ../../
svn up

cd trunk
echo trunk2 > file
echo trunk2 > dir/file
svn ci -m 'edit on trunk'
cd ..
svn up

svn rm trunk
svn ci -m 'Close trunk.'
svn up

cd branches/test
svn rm file
svn cp $repo/trunk/file@5 file
svn rm dir
svn cp $repo/trunk/dir@5 dir
svn ci -m 'copy from trunk before close'
cd ../..
svn up

cd ../..
svnadmin dump temp/repo > copyafterclose.svndump
echo
echo 'Complete.'
echo 'You probably want to clean up temp now.'
echo 'Dump in copyafterclose.svndump'
exit 0