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

#!/bin/sh

mkdir temp
cd temp

svnadmin create repo
svn co file://`pwd`/repo wc
cd wc

mkdir -p trunk branches
svn add trunk branches
svn ci -m'initial structure'
cd trunk
echo a>a
svn add a
svn ci -mci1 a
cd ..
svn up
svn cp trunk branches/foo
svn ci -m'branch foo'
cd branches/foo
ln -s a fnord
svn add fnord
svn ci -msymlink fnord
mkdir 'spacy name'
echo a > 'spacy name/spacy file'
svn add 'spacy name'
svn ci -mspacy 'spacy name'
svn up
echo b > 'spacy name/surprise ~'
svn add 'spacy name/surprise ~'
svn ci -mtilde 'spacy name'
svn up ../..
echo foo > exe
chmod +x exe
svn add exe
svn ci -mexecutable exe
svn up ../..
cd ../../trunk
svn merge ../branches/foo
svn ci -mmerge
svn up

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