view tests/fixtures/revert.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 9c3b4f59e7e6
children
line wrap: on
line source

#!/bin/sh
#
# Generate revert.svndump
#

rm -rf temp
mkdir temp
cd temp
mkdir -p import/trunk/dir
cd import/trunk
echo a > a
echo b > dir/b
cd ../..

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

svn co $svnurl project
cd project
echo a >> trunk/a
echo b >> trunk/dir/b
svn ci -m changefiles
svn up
# Test directory revert
svn rm trunk
svn cp $svnurl/trunk@1 trunk
svn st
svn ci -m revert
svn up
# Test file revert
svn rm trunk/a
svn rm trunk/dir/b
svn cp $svnurl/trunk/a@2 trunk/a
svn cp $svnurl/trunk/dir/b@2 trunk/dir/b
svn ci -m revert2
cd ..

svnadmin dump testrepo > ../revert.svndump