view tests/fixtures/branch_prop_edit.sh @ 1036:e775ffbcb359

push: also suggest user rebase if we get SVN_ERR_FS_ALREADY_EXISTS Subversion differentiates adding an already-added file from transaction being out of date and edit conflicts. Fixes #400.
author Augie Fackler <raf@durin42.com>
date Tue, 16 Jul 2013 10:09:55 -0400
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