summaryrefslogtreecommitdiff
path: root/t/t9151/make-svnmerge-dump
diff options
context:
space:
mode:
authorTuomas Suutari <tuomas.suutari@gmail.com>2010-02-22 07:57:20 (GMT)
committerEric Wong <normalperson@yhbt.net>2010-02-26 09:30:23 (GMT)
commitae5b370c9bbc161c68059cea7d9f7eb5b556e050 (patch)
treee078d3bd10988f7d707bf7eab9d615c77fb82ac1 /t/t9151/make-svnmerge-dump
parentf7311dc2293d9c52827c518933c80bd664023e97 (diff)
downloadgit-ae5b370c9bbc161c68059cea7d9f7eb5b556e050.zip
git-ae5b370c9bbc161c68059cea7d9f7eb5b556e050.tar.gz
git-ae5b370c9bbc161c68059cea7d9f7eb5b556e050.tar.bz2
t9151: Fix a few commits in the SVN dump
A few "svn cp" commands and commit commands were executed in incorrect order. Therefore some of the desired commits were missing and some were committed with wrong revision number in the commit message. This made it hard to compare the produced git repository with the SVN repository. The dump file is updated too, but only the relevant parts and with hand-edited timestamps to make history linear. Signed-off-by: Tuomas Suutari <tuomas.suutari@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t9151/make-svnmerge-dump')
-rw-r--r--t/t9151/make-svnmerge-dump6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9151/make-svnmerge-dump b/t/t9151/make-svnmerge-dump
index 3d73f14..3168c7c 100644
--- a/t/t9151/make-svnmerge-dump
+++ b/t/t9151/make-svnmerge-dump
@@ -174,8 +174,8 @@ cd ..
say "Make PARTIAL branch"
svn update
-i=$(commit $i "make partial branch")
svn cp trunk/subdir branches/partial
+i=$(commit $i "make partial branch")
say "Make a commit to PARTIAL"
svn update
@@ -194,13 +194,13 @@ cd ../../
say "Tagging trunk"
svn update
-i=$(commit $i "tagging v1.0")
svn cp trunk tags/v1.0
+i=$(commit $i "tagging v1.0")
say "Branching BUGFIX from v1.0"
svn update
-i=$(commit $i "make bugfix branch from tag")
svn cp tags/v1.0 branches/bugfix
+i=$(commit $i "make bugfix branch from tag")
say "Make a commit to BUGFIX"
svn update