2009-10-20 02:42:02 +00:00
|
|
|
|
#!/bin/sh
|
|
|
|
|
|
#
|
|
|
|
|
|
# this script sets up a Subversion repository for Makefile in the
|
|
|
|
|
|
# first ever git merge, as if it were done with svnmerge (SVN 1.5+)
|
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
|
|
rm -rf foo.svn foo
|
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
|
|
mkdir foo.svn
|
|
|
|
|
|
svnadmin create foo.svn
|
|
|
|
|
|
svn co file://`pwd`/foo.svn foo
|
|
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
commit() {
|
|
|
|
|
|
i=$(( $1 + 1 ))
|
|
|
|
|
|
shift;
|
|
|
|
|
|
svn commit -m "(r$i) $*" >/dev/null || exit 1
|
|
|
|
|
|
echo $i
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
say() {
|
|
|
|
|
|
echo "[1m * $*[0m"
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
i=0
|
2009-10-20 02:42:02 +00:00
|
|
|
|
cd foo
|
|
|
|
|
|
mkdir trunk
|
|
|
|
|
|
mkdir branches
|
2010-01-21 21:55:48 +00:00
|
|
|
|
mkdir tags
|
|
|
|
|
|
svn add trunk branches tags
|
|
|
|
|
|
i=$(commit $i "Setup trunk, branches, and tags")
|
2009-10-20 02:42:02 +00:00
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
git cat-file blob 6683463e:Makefile > trunk/Makefile
|
|
|
|
|
|
svn add trunk/Makefile
|
2009-10-20 02:42:02 +00:00
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
say "Committing ANCESTOR"
|
|
|
|
|
|
i=$(commit $i "ancestor")
|
2009-10-20 02:42:02 +00:00
|
|
|
|
svn cp trunk branches/left
|
|
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
say "Committing BRANCH POINT"
|
|
|
|
|
|
i=$(commit $i "make left branch")
|
git svn: handle SVN merges from revisions past the tip of the branch
When recording the revisions that it has merged, SVN sets the top
revision to be the latest revision in the repository, which is not
necessarily a revision on the branch that is being merged from. When
it is not on the branch, git-svn fails to add the extra parent to
represent the merge because it relies on finding the commit on the
branch that corresponds to the top of the SVN merge range.
In order to correctly handle this case, we look for the maximum
revision less than or equal to the top of the SVN merge range that is
actually on the branch being merged from.
[ew: This includes the following (squashed) commit to prevent
errors during bisect:]
Author: Toby Allsopp <toby.allsopp@navman.co.nz>
Date: Fri Nov 13 09:48:39 2009 +1300
git-svn: add (failing) test for SVN 1.5+ merge with intervening commit
This test exposes a bug in git-svn's handling of SVN 1.5+ mergeinfo
properties. The problematic case is when there is some commit on an
unrelated branch after the last commit on the merged-from branch.
When SVN records the mergeinfo property, it records the latest
revision in the whole repository, which, in the problematic case, is
not on the branch it is merging from.
To trigger the git-svn bug, we modify t9151 to include two SVN merges,
the second of which has an intervening commit. The SVN dump was
generated using SVN 1.6.6 (on Debian squeeze amd64).
Signed-off-by: Toby Allsopp <toby.allsopp@navman.co.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>
2009-11-14 21:26:47 +00:00
|
|
|
|
svn cp trunk branches/right
|
|
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
say "Committing other BRANCH POINT"
|
|
|
|
|
|
i=$(commit $i "make right branch")
|
2009-10-20 02:42:02 +00:00
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
say "Committing LEFT UPDATE"
|
|
|
|
|
|
git cat-file blob 5873b67e:Makefile > branches/left/Makefile
|
|
|
|
|
|
i=$(commit $i "left update 1")
|
2009-10-20 02:42:02 +00:00
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
git cat-file blob 75118b13:Makefile > branches/right/Makefile
|
|
|
|
|
|
say "Committing RIGHT UPDATE"
|
|
|
|
|
|
pre_right_update_1=$i
|
|
|
|
|
|
i=$(commit $i "right update 1")
|
2009-10-20 02:42:02 +00:00
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
say "Making more commits on LEFT"
|
|
|
|
|
|
git cat-file blob ff5ebe39:Makefile > branches/left/Makefile
|
|
|
|
|
|
i=$(commit $i "left update 2")
|
|
|
|
|
|
git cat-file blob b5039db6:Makefile > branches/left/Makefile
|
|
|
|
|
|
i=$(commit $i "left update 3")
|
2009-10-20 02:42:02 +00:00
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
say "Making a LEFT SUB-BRANCH"
|
|
|
|
|
|
svn cp branches/left branches/left-sub
|
|
|
|
|
|
sub_left_make=$i
|
|
|
|
|
|
i=$(commit $i "make left sub-branch")
|
2009-10-20 02:42:02 +00:00
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
say "Making a commit on LEFT SUB-BRANCH"
|
|
|
|
|
|
echo "crunch" > branches/left-sub/README
|
|
|
|
|
|
svn add branches/left-sub/README
|
|
|
|
|
|
i=$(commit $i "left sub-branch update 1")
|
2009-10-20 02:42:02 +00:00
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
say "Merging LEFT to TRUNK"
|
2009-10-20 02:42:02 +00:00
|
|
|
|
svn update
|
|
|
|
|
|
cd trunk
|
|
|
|
|
|
svn merge ../branches/left --accept postpone
|
2009-12-19 16:20:30 +00:00
|
|
|
|
git cat-file blob b5039db6:Makefile > Makefile
|
2009-10-20 02:42:02 +00:00
|
|
|
|
svn resolved Makefile
|
2009-12-19 16:20:30 +00:00
|
|
|
|
i=$(commit $i "Merge left to trunk 1")
|
|
|
|
|
|
cd ..
|
2009-10-20 02:42:02 +00:00
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
say "Making more commits on LEFT and RIGHT"
|
|
|
|
|
|
echo "touche" > branches/left/zlonk
|
|
|
|
|
|
svn add branches/left/zlonk
|
|
|
|
|
|
i=$(commit $i "left update 4")
|
|
|
|
|
|
echo "thwacke" > branches/right/bang
|
|
|
|
|
|
svn add branches/right/bang
|
|
|
|
|
|
i=$(commit $i "right update 2")
|
git svn: handle SVN merges from revisions past the tip of the branch
When recording the revisions that it has merged, SVN sets the top
revision to be the latest revision in the repository, which is not
necessarily a revision on the branch that is being merged from. When
it is not on the branch, git-svn fails to add the extra parent to
represent the merge because it relies on finding the commit on the
branch that corresponds to the top of the SVN merge range.
In order to correctly handle this case, we look for the maximum
revision less than or equal to the top of the SVN merge range that is
actually on the branch being merged from.
[ew: This includes the following (squashed) commit to prevent
errors during bisect:]
Author: Toby Allsopp <toby.allsopp@navman.co.nz>
Date: Fri Nov 13 09:48:39 2009 +1300
git-svn: add (failing) test for SVN 1.5+ merge with intervening commit
This test exposes a bug in git-svn's handling of SVN 1.5+ mergeinfo
properties. The problematic case is when there is some commit on an
unrelated branch after the last commit on the merged-from branch.
When SVN records the mergeinfo property, it records the latest
revision in the whole repository, which, in the problematic case, is
not on the branch it is merging from.
To trigger the git-svn bug, we modify t9151 to include two SVN merges,
the second of which has an intervening commit. The SVN dump was
generated using SVN 1.6.6 (on Debian squeeze amd64).
Signed-off-by: Toby Allsopp <toby.allsopp@navman.co.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>
2009-11-14 21:26:47 +00:00
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
say "Squash merge of RIGHT tip 2 commits onto TRUNK"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd trunk
|
|
|
|
|
|
svn merge -r$pre_right_update_1:$i ../branches/right
|
|
|
|
|
|
i=$(commit $i "Cherry-pick right 2 commits to trunk")
|
|
|
|
|
|
cd ..
|
git svn: handle SVN merges from revisions past the tip of the branch
When recording the revisions that it has merged, SVN sets the top
revision to be the latest revision in the repository, which is not
necessarily a revision on the branch that is being merged from. When
it is not on the branch, git-svn fails to add the extra parent to
represent the merge because it relies on finding the commit on the
branch that corresponds to the top of the SVN merge range.
In order to correctly handle this case, we look for the maximum
revision less than or equal to the top of the SVN merge range that is
actually on the branch being merged from.
[ew: This includes the following (squashed) commit to prevent
errors during bisect:]
Author: Toby Allsopp <toby.allsopp@navman.co.nz>
Date: Fri Nov 13 09:48:39 2009 +1300
git-svn: add (failing) test for SVN 1.5+ merge with intervening commit
This test exposes a bug in git-svn's handling of SVN 1.5+ mergeinfo
properties. The problematic case is when there is some commit on an
unrelated branch after the last commit on the merged-from branch.
When SVN records the mergeinfo property, it records the latest
revision in the whole repository, which, in the problematic case, is
not on the branch it is merging from.
To trigger the git-svn bug, we modify t9151 to include two SVN merges,
the second of which has an intervening commit. The SVN dump was
generated using SVN 1.6.6 (on Debian squeeze amd64).
Signed-off-by: Toby Allsopp <toby.allsopp@navman.co.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>
2009-11-14 21:26:47 +00:00
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
say "Merging RIGHT to TRUNK"
|
git svn: handle SVN merges from revisions past the tip of the branch
When recording the revisions that it has merged, SVN sets the top
revision to be the latest revision in the repository, which is not
necessarily a revision on the branch that is being merged from. When
it is not on the branch, git-svn fails to add the extra parent to
represent the merge because it relies on finding the commit on the
branch that corresponds to the top of the SVN merge range.
In order to correctly handle this case, we look for the maximum
revision less than or equal to the top of the SVN merge range that is
actually on the branch being merged from.
[ew: This includes the following (squashed) commit to prevent
errors during bisect:]
Author: Toby Allsopp <toby.allsopp@navman.co.nz>
Date: Fri Nov 13 09:48:39 2009 +1300
git-svn: add (failing) test for SVN 1.5+ merge with intervening commit
This test exposes a bug in git-svn's handling of SVN 1.5+ mergeinfo
properties. The problematic case is when there is some commit on an
unrelated branch after the last commit on the merged-from branch.
When SVN records the mergeinfo property, it records the latest
revision in the whole repository, which, in the problematic case, is
not on the branch it is merging from.
To trigger the git-svn bug, we modify t9151 to include two SVN merges,
the second of which has an intervening commit. The SVN dump was
generated using SVN 1.6.6 (on Debian squeeze amd64).
Signed-off-by: Toby Allsopp <toby.allsopp@navman.co.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>
2009-11-14 21:26:47 +00:00
|
|
|
|
svn update
|
|
|
|
|
|
cd trunk
|
2009-12-19 16:20:30 +00:00
|
|
|
|
svn merge ../branches/right --accept postpone
|
|
|
|
|
|
git cat-file blob b51ad431:Makefile > Makefile
|
|
|
|
|
|
svn resolved Makefile
|
|
|
|
|
|
i=$(commit $i "Merge right to trunk 1")
|
|
|
|
|
|
cd ..
|
git svn: handle SVN merges from revisions past the tip of the branch
When recording the revisions that it has merged, SVN sets the top
revision to be the latest revision in the repository, which is not
necessarily a revision on the branch that is being merged from. When
it is not on the branch, git-svn fails to add the extra parent to
represent the merge because it relies on finding the commit on the
branch that corresponds to the top of the SVN merge range.
In order to correctly handle this case, we look for the maximum
revision less than or equal to the top of the SVN merge range that is
actually on the branch being merged from.
[ew: This includes the following (squashed) commit to prevent
errors during bisect:]
Author: Toby Allsopp <toby.allsopp@navman.co.nz>
Date: Fri Nov 13 09:48:39 2009 +1300
git-svn: add (failing) test for SVN 1.5+ merge with intervening commit
This test exposes a bug in git-svn's handling of SVN 1.5+ mergeinfo
properties. The problematic case is when there is some commit on an
unrelated branch after the last commit on the merged-from branch.
When SVN records the mergeinfo property, it records the latest
revision in the whole repository, which, in the problematic case, is
not on the branch it is merging from.
To trigger the git-svn bug, we modify t9151 to include two SVN merges,
the second of which has an intervening commit. The SVN dump was
generated using SVN 1.6.6 (on Debian squeeze amd64).
Signed-off-by: Toby Allsopp <toby.allsopp@navman.co.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>
2009-11-14 21:26:47 +00:00
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
say "Making more commits on RIGHT and TRUNK"
|
|
|
|
|
|
echo "whamm" > branches/right/urkkk
|
|
|
|
|
|
svn add branches/right/urkkk
|
|
|
|
|
|
i=$(commit $i "right update 3")
|
|
|
|
|
|
echo "pow" > trunk/vronk
|
|
|
|
|
|
svn add trunk/vronk
|
|
|
|
|
|
i=$(commit $i "trunk update 1")
|
git svn: handle SVN merges from revisions past the tip of the branch
When recording the revisions that it has merged, SVN sets the top
revision to be the latest revision in the repository, which is not
necessarily a revision on the branch that is being merged from. When
it is not on the branch, git-svn fails to add the extra parent to
represent the merge because it relies on finding the commit on the
branch that corresponds to the top of the SVN merge range.
In order to correctly handle this case, we look for the maximum
revision less than or equal to the top of the SVN merge range that is
actually on the branch being merged from.
[ew: This includes the following (squashed) commit to prevent
errors during bisect:]
Author: Toby Allsopp <toby.allsopp@navman.co.nz>
Date: Fri Nov 13 09:48:39 2009 +1300
git-svn: add (failing) test for SVN 1.5+ merge with intervening commit
This test exposes a bug in git-svn's handling of SVN 1.5+ mergeinfo
properties. The problematic case is when there is some commit on an
unrelated branch after the last commit on the merged-from branch.
When SVN records the mergeinfo property, it records the latest
revision in the whole repository, which, in the problematic case, is
not on the branch it is merging from.
To trigger the git-svn bug, we modify t9151 to include two SVN merges,
the second of which has an intervening commit. The SVN dump was
generated using SVN 1.6.6 (on Debian squeeze amd64).
Signed-off-by: Toby Allsopp <toby.allsopp@navman.co.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>
2009-11-14 21:26:47 +00:00
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
say "Merging RIGHT to LEFT SUB-BRANCH"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd branches/left-sub
|
|
|
|
|
|
svn merge ../right --accept postpone
|
git svn: handle SVN merges from revisions past the tip of the branch
When recording the revisions that it has merged, SVN sets the top
revision to be the latest revision in the repository, which is not
necessarily a revision on the branch that is being merged from. When
it is not on the branch, git-svn fails to add the extra parent to
represent the merge because it relies on finding the commit on the
branch that corresponds to the top of the SVN merge range.
In order to correctly handle this case, we look for the maximum
revision less than or equal to the top of the SVN merge range that is
actually on the branch being merged from.
[ew: This includes the following (squashed) commit to prevent
errors during bisect:]
Author: Toby Allsopp <toby.allsopp@navman.co.nz>
Date: Fri Nov 13 09:48:39 2009 +1300
git-svn: add (failing) test for SVN 1.5+ merge with intervening commit
This test exposes a bug in git-svn's handling of SVN 1.5+ mergeinfo
properties. The problematic case is when there is some commit on an
unrelated branch after the last commit on the merged-from branch.
When SVN records the mergeinfo property, it records the latest
revision in the whole repository, which, in the problematic case, is
not on the branch it is merging from.
To trigger the git-svn bug, we modify t9151 to include two SVN merges,
the second of which has an intervening commit. The SVN dump was
generated using SVN 1.6.6 (on Debian squeeze amd64).
Signed-off-by: Toby Allsopp <toby.allsopp@navman.co.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>
2009-11-14 21:26:47 +00:00
|
|
|
|
git cat-file blob b51ad431:Makefile > Makefile
|
|
|
|
|
|
svn resolved Makefile
|
2009-12-19 16:20:30 +00:00
|
|
|
|
i=$(commit $i "Merge right to left sub-branch")
|
|
|
|
|
|
cd ../..
|
git svn: handle SVN merges from revisions past the tip of the branch
When recording the revisions that it has merged, SVN sets the top
revision to be the latest revision in the repository, which is not
necessarily a revision on the branch that is being merged from. When
it is not on the branch, git-svn fails to add the extra parent to
represent the merge because it relies on finding the commit on the
branch that corresponds to the top of the SVN merge range.
In order to correctly handle this case, we look for the maximum
revision less than or equal to the top of the SVN merge range that is
actually on the branch being merged from.
[ew: This includes the following (squashed) commit to prevent
errors during bisect:]
Author: Toby Allsopp <toby.allsopp@navman.co.nz>
Date: Fri Nov 13 09:48:39 2009 +1300
git-svn: add (failing) test for SVN 1.5+ merge with intervening commit
This test exposes a bug in git-svn's handling of SVN 1.5+ mergeinfo
properties. The problematic case is when there is some commit on an
unrelated branch after the last commit on the merged-from branch.
When SVN records the mergeinfo property, it records the latest
revision in the whole repository, which, in the problematic case, is
not on the branch it is merging from.
To trigger the git-svn bug, we modify t9151 to include two SVN merges,
the second of which has an intervening commit. The SVN dump was
generated using SVN 1.6.6 (on Debian squeeze amd64).
Signed-off-by: Toby Allsopp <toby.allsopp@navman.co.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>
2009-11-14 21:26:47 +00:00
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
say "Making more commits on LEFT SUB-BRANCH and LEFT"
|
|
|
|
|
|
echo "zowie" > branches/left-sub/wham_eth
|
|
|
|
|
|
svn add branches/left-sub/wham_eth
|
|
|
|
|
|
pre_sub_left_update_2=$i
|
|
|
|
|
|
i=$(commit $i "left sub-branch update 2")
|
|
|
|
|
|
sub_left_update_2=$i
|
|
|
|
|
|
echo "eee_yow" > branches/left/glurpp
|
|
|
|
|
|
svn add branches/left/glurpp
|
|
|
|
|
|
i=$(commit $i "left update 5")
|
|
|
|
|
|
|
|
|
|
|
|
say "Cherry pick LEFT SUB-BRANCH commit to LEFT"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd branches/left
|
|
|
|
|
|
svn merge -r$pre_sub_left_update_2:$sub_left_update_2 ../left-sub
|
|
|
|
|
|
i=$(commit $i "Cherry-pick left sub-branch commit to left")
|
|
|
|
|
|
cd ../..
|
2009-10-20 02:42:02 +00:00
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
say "Merging LEFT SUB-BRANCH back to LEFT"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd branches/left
|
|
|
|
|
|
# it's only a merge because the previous merge cherry-picked the top commit
|
|
|
|
|
|
svn merge -r$sub_left_make:$sub_left_update_2 ../left-sub --accept postpone
|
|
|
|
|
|
i=$(commit $i "Merge left sub-branch to left")
|
2009-10-20 02:42:02 +00:00
|
|
|
|
cd ../..
|
|
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
say "Merging EVERYTHING to TRUNK"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd trunk
|
|
|
|
|
|
svn merge ../branches/left --accept postpone
|
|
|
|
|
|
svn resolved bang
|
|
|
|
|
|
i=$(commit $i "Merge left to trunk 2")
|
|
|
|
|
|
# this merge, svn happily updates the mergeinfo, but there is actually
|
|
|
|
|
|
# nothing to merge. git-svn will not make a meaningless merge commit.
|
|
|
|
|
|
svn merge ../branches/right --accept postpone
|
|
|
|
|
|
i=$(commit $i "non-merge right to trunk 2")
|
|
|
|
|
|
cd ..
|
|
|
|
|
|
|
2010-02-22 07:57:21 +00:00
|
|
|
|
say "Branching b1 from trunk"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
svn cp trunk branches/b1
|
|
|
|
|
|
i=$(commit $i "make b1 branch from trunk")
|
|
|
|
|
|
|
|
|
|
|
|
say "Branching b2 from trunk"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
svn cp trunk branches/b2
|
|
|
|
|
|
i=$(commit $i "make b2 branch from trunk")
|
|
|
|
|
|
|
|
|
|
|
|
say "Make a commit to b2"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd branches/b2
|
|
|
|
|
|
echo "b2" > b2file
|
|
|
|
|
|
svn add b2file
|
|
|
|
|
|
i=$(commit $i "b2 update 1")
|
|
|
|
|
|
cd ../..
|
|
|
|
|
|
|
|
|
|
|
|
say "Make a commit to b1"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd branches/b1
|
|
|
|
|
|
echo "b1" > b1file
|
|
|
|
|
|
svn add b1file
|
|
|
|
|
|
i=$(commit $i "b1 update 1")
|
|
|
|
|
|
cd ../..
|
|
|
|
|
|
|
|
|
|
|
|
say "Merge b1 to trunk"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd trunk
|
|
|
|
|
|
svn merge ../branches/b1/ --accept postpone
|
|
|
|
|
|
i=$(commit $i "Merge b1 to trunk")
|
|
|
|
|
|
cd ..
|
|
|
|
|
|
|
|
|
|
|
|
say "Make a commit to trunk before merging trunk to b2"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd trunk
|
|
|
|
|
|
echo "trunk" > trunkfile
|
|
|
|
|
|
svn add trunkfile
|
|
|
|
|
|
i=$(commit $i "trunk commit before merging trunk to b2")
|
|
|
|
|
|
cd ..
|
|
|
|
|
|
|
|
|
|
|
|
say "Merge trunk to b2"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd branches/b2
|
|
|
|
|
|
svn merge ../../trunk/ --accept postpone
|
|
|
|
|
|
i=$(commit $i "Merge trunk to b2")
|
|
|
|
|
|
cd ../..
|
|
|
|
|
|
|
|
|
|
|
|
say "Merge b2 to trunk"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd trunk
|
|
|
|
|
|
svn merge ../branches/b2/ --accept postpone
|
|
|
|
|
|
svn resolved b1file
|
|
|
|
|
|
svn resolved trunkfile
|
|
|
|
|
|
i=$(commit $i "Merge b2 to trunk")
|
|
|
|
|
|
cd ..
|
|
|
|
|
|
|
|
|
|
|
|
say "Creating f1 from trunk with a new file"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
svn cp trunk branches/f1
|
|
|
|
|
|
cd branches/f1
|
|
|
|
|
|
echo "f1" > f1file
|
|
|
|
|
|
svn add f1file
|
|
|
|
|
|
cd ../..
|
|
|
|
|
|
i=$(commit $i "make f1 branch from trunk with a new file")
|
|
|
|
|
|
|
|
|
|
|
|
say "Creating f2 from trunk with a new file"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
svn cp trunk branches/f2
|
|
|
|
|
|
cd branches/f2
|
|
|
|
|
|
echo "f2" > f2file
|
|
|
|
|
|
svn add f2file
|
|
|
|
|
|
cd ../..
|
|
|
|
|
|
i=$(commit $i "make f2 branch from trunk with a new file")
|
|
|
|
|
|
|
|
|
|
|
|
say "Merge f1 and f2 to trunk in one go"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd trunk
|
|
|
|
|
|
svn merge ../branches/f1/ --accept postpone
|
|
|
|
|
|
svn merge ../branches/f2/ --accept postpone
|
|
|
|
|
|
i=$(commit $i "Merge f1 and f2 to trunk")
|
|
|
|
|
|
cd ..
|
|
|
|
|
|
|
2010-01-21 21:55:48 +00:00
|
|
|
|
say "Adding subdirectory to LEFT"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd branches/left
|
|
|
|
|
|
mkdir subdir
|
|
|
|
|
|
echo "Yeehaw" > subdir/cowboy
|
|
|
|
|
|
svn add subdir
|
|
|
|
|
|
i=$(commit $i "add subdirectory to left branch")
|
|
|
|
|
|
cd ../../
|
|
|
|
|
|
|
|
|
|
|
|
say "Merging LEFT to TRUNK"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd trunk
|
|
|
|
|
|
svn merge ../branches/left --accept postpone
|
|
|
|
|
|
i=$(commit $i "merge left to trunk")
|
|
|
|
|
|
cd ..
|
|
|
|
|
|
|
|
|
|
|
|
say "Make PARTIAL branch"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
svn cp trunk/subdir branches/partial
|
2010-02-22 07:57:20 +00:00
|
|
|
|
i=$(commit $i "make partial branch")
|
2010-01-21 21:55:48 +00:00
|
|
|
|
|
|
|
|
|
|
say "Make a commit to PARTIAL"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd branches/partial
|
|
|
|
|
|
echo "racecar" > palindromes
|
|
|
|
|
|
svn add palindromes
|
|
|
|
|
|
i=$(commit $i "partial update")
|
|
|
|
|
|
cd ../../
|
|
|
|
|
|
|
|
|
|
|
|
say "Merge PARTIAL to TRUNK"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd trunk/subdir
|
|
|
|
|
|
svn merge ../../branches/partial --accept postpone
|
|
|
|
|
|
i=$(commit $i "merge partial to trunk")
|
|
|
|
|
|
cd ../../
|
|
|
|
|
|
|
|
|
|
|
|
say "Tagging trunk"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
svn cp trunk tags/v1.0
|
2010-02-22 07:57:20 +00:00
|
|
|
|
i=$(commit $i "tagging v1.0")
|
2010-01-21 21:55:48 +00:00
|
|
|
|
|
|
|
|
|
|
say "Branching BUGFIX from v1.0"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
svn cp tags/v1.0 branches/bugfix
|
2010-02-22 07:57:20 +00:00
|
|
|
|
i=$(commit $i "make bugfix branch from tag")
|
2010-01-21 21:55:48 +00:00
|
|
|
|
|
|
|
|
|
|
say "Make a commit to BUGFIX"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd branches/bugfix/
|
|
|
|
|
|
echo "kayak" >> subdir/palindromes
|
|
|
|
|
|
i=$(commit $i "commit to bugfix")
|
|
|
|
|
|
cd ../../
|
|
|
|
|
|
|
|
|
|
|
|
say "Merge BUGFIX to TRUNK"
|
|
|
|
|
|
svn update
|
|
|
|
|
|
cd trunk
|
|
|
|
|
|
svn merge ../branches/bugfix/ --accept postpone
|
|
|
|
|
|
i=$(commit $i "Merge BUGFIX to TRUNK")
|
|
|
|
|
|
cd ..
|
|
|
|
|
|
|
2009-12-19 16:20:30 +00:00
|
|
|
|
cd ..
|
2009-10-20 02:42:02 +00:00
|
|
|
|
svnadmin dump foo.svn > svn-mergeinfo.dump
|
|
|
|
|
|
|
|
|
|
|
|
rm -rf foo foo.svn
|