##// END OF EJS Templates
largefiles: restore standins according to restored dirstate...
largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

File last commit:

r11194:67985364 stable
r22285:85bded43 default
Show More
svndump-branches.sh
73 lines | 1.5 KiB | application/x-sh | BashLexer
/ tests / svn / svndump-branches.sh
Patrick Mezard
Rewrite svn tests using svndump...
r7475 #!/bin/sh
#
# Use this script to generate branches.svndump
#
mkdir temp
cd temp
mkdir project-orig
cd project-orig
mkdir trunk
mkdir branches
cd ..
svnadmin create svn-repo
svnurl=file://`pwd`/svn-repo
svn import project-orig $svnurl -m "init projA"
svn co $svnurl project
cd project
echo a > trunk/a
echo b > trunk/b
echo c > trunk/c
Patrick Mezard
convert/svn: remove dead code from entry deletion code path...
r8884 mkdir trunk/dir
echo e > trunk/dir/e
Patrick Mezard
Rewrite svn tests using svndump...
r7475 # Add a file within branches, used to confuse branch detection
echo d > branches/notinbranch
Patrick Mezard
convert/svn: remove dead code from entry deletion code path...
r8884 svn add trunk/a trunk/b trunk/c trunk/dir branches/notinbranch
Patrick Mezard
Rewrite svn tests using svndump...
r7475 svn ci -m hello
Patrick Mezard
convert/svn: remove dead code from entry deletion code path...
r8884 svn up
Patrick Mezard
Rewrite svn tests using svndump...
r7475
# Branch to old
svn copy trunk branches/old
svn rm branches/old/c
Patrick Mezard
convert/svn: remove dead code from entry deletion code path...
r8884 svn rm branches/old/dir
svn ci -m "branch trunk, remove c and dir"
Patrick Mezard
Rewrite svn tests using svndump...
r7475 svn up
# Update trunk
echo a >> trunk/a
svn ci -m "change a"
# Update old branch
echo b >> branches/old/b
svn ci -m "change b"
# Create a cross-branch revision
svn move trunk/b branches/old/c
echo c >> branches/old/c
svn ci -m "move and update c"
# Update old branch again
echo b >> branches/old/b
svn ci -m "change b again"
# Move back and forth between branch of similar names
# This used to generate fake copy records
svn up
svn move branches/old branches/old2
svn ci -m "move to old2"
svn move branches/old2 branches/old
svn ci -m "move back to old"
# Update trunk again
echo a > trunk/a
svn ci -m "last change to a"
# Branch again from a converted revision
svn copy -r 1 $svnurl/trunk branches/old3
svn ci -m "branch trunk@1 into old3"
cd ..
svnadmin dump svn-repo > ../branches.svndump