Sorry about the line wraps, I try to fix them with some backslash:
-8<-----------------------------------------
svnadmin create /tmp/repo_test
mkdir svn_work
1 svn import -m "" svn_work file:///tmp/repo_test/trunk
2 svn import -m "" svn_work file:///tmp/repo_test/branches
rmdir svn_work
svn checkout file:///tmp/repo_test/trunk svn_work
echo hello > svn_work/hello.txt
svn add svn_work/hello.txt
3 svn commit -m "" svn_work/
4 svn copy -m "" file:///tmp/repo_test/trunk \
file:///tmp/repo_test/branches/1
echo hello world > svn_work/hello.txt
5 svn commit -m "" svn_work/
6 svn copy -m "" file:///tmp/repo_test/trunk \
file:///tmp/repo_test/branches/2
svn switch file:///tmp/repo_test/branches/2 svn_work
echo hello > svn_work/hello2.txt
svn add svn_work/hello2.txt
7 svn commit -m "" svn_work/
svn switch file:///tmp/repo_test/branches/1 svn_work
svn merge file:///tmp/repo_test/trunk svn_work
8 svn commit -m "" svn_work/
echo hello > svn_work/hello3.txt
svn add svn_work/hello3.txt
9 svn commit -m "" svn_work/
svn switch file:///tmp/repo_test/trunk svn_work/
svn merge --reintegrate file:///tmp/repo_test/branches/1 svn_work
10 svn commit -m "" svn_work/
svn switch file:///tmp/repo_test/branches/2 svn_work
svn merge file:///tmp/repo_test/trunk svn_work
11 svn commit -m "" svn_work/
svn switch file:///tmp/repo_test/trunk svn_work/
svn merge --reintegrate file:///tmp/repo_test/branches/2 svn_work
12 svn commit -m "" svn_work/
svn log -q -g file:///tmp/repo_test/trunk
-8<-----------------------------------------
-8<-----------------------------------------
svnadmin create /tmp/repo_test
mkdir svn_work
svn import -m "" svn_work file:///tmp/repo_test/trunk
svn import -m "" svn_work file:///tmp/repo_test/branches
rmdir svn_work
svn checkout file:///tmp/repo_test/trunk svn_work
echo hello > svn_work/hello.txt
svn add svn_work/hello.txt
svn commit -m "" svn_work/
svn copy -m "" file:///tmp/repo_test/trunk \
file:///tmp/repo_test/branches/1
echo hello world > svn_work/hello.txt
svn commit -m "" svn_work/
svn copy -m "" file:///tmp/repo_test/trunk \
file:///tmp/repo_test/branches/2
svn switch file:///tmp/repo_test/branches/2 svn_work
echo hello > svn_work/hello2.txt
svn add svn_work/hello2.txt
svn commit -m "" svn_work/
svn switch file:///tmp/repo_test/branches/1 svn_work
svn merge file:///tmp/repo_test/trunk svn_work
svn commit -m "" svn_work/
echo hello > svn_work/hello3.txt
svn add svn_work/hello3.txt
svn commit -m "" svn_work/
svn switch file:///tmp/repo_test/trunk svn_work/
svn merge --reintegrate file:///tmp/repo_test/branches/1 svn_work
svn commit -m "" svn_work/
svn switch file:///tmp/repo_test/branches/2 svn_work
svn merge file:///tmp/repo_test/trunk svn_work
svn commit -m "" svn_work/
svn switch file:///tmp/repo_test/trunk svn_work/
svn merge --reintegrate file:///tmp/repo_test/branches/2 svn_work
svn commit -m "" svn_work/
svn log -q -g file:///tmp/repo_test/trunk
-8<-----------------------------------------
regards Henrik
Received on 2014-02-26 20:54:12 CET