Created
August 11, 2011 07:08
-
-
Save apk/1139064 to your computer and use it in GitHub Desktop.
Lose data in svn merge in four steps (branch, move dir here, modify content there, merge: mods lost)
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
set -xe | |
rm -rf repo wc | |
URL=file:///`pwd`/repo | |
time svnadmin create repo | |
time svn mkdir $URL/tr -m 'base dir' | |
time svn checkout $URL/tr wc | |
cd wc | |
mkdir A | |
cat >A/B <<EOF | |
package A | |
blah B | |
EOF | |
cat >A/D <<EOF | |
package A | |
blah D | |
EOF | |
svn add A | |
svn commit -m 'add A' | |
svn cp $URL/tr $URL/br -m 'make branch' | |
svn switch $URL/br | |
svn mv A C | |
cat >C/B <<EOF | |
package C | |
blah B | |
EOF | |
cat >C/D <<EOF | |
package C | |
blah D | |
EOF | |
svn commit -m 'move A to C' | |
svn switch $URL/tr | |
echo "Additional A/B" >>A/B | |
#cat >A/E <<EOF | |
# package A | |
# blah E | |
#EOF | |
svn commit -m 'update A/B' | |
svn up | |
svn merge --reintegrate $URL/br | |
cat A/B || true | |
: There should be 'Additional A/B' in here | |
cat C/B |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment