Mercurial > hg
view tests/svn/svndump-empty.sh @ 23418:c90d9ab6777a stable
tests: add test-issue3084.t cases for 'changed but same' as for 'unchanged'
Use suffix -same for cases where file changed but content is the same - that is
the case where manifestmerge doesn't detect that a file is unchanged.
(The suffix -id is already used for cases where the file didn't change - that
is the trivial case where manifestmerge detects that the file is unchanged.)
These new tests are good but the results are bad. There shouldn't be any merge
conflicts or prompts when one side didn't change.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Mon, 01 Dec 2014 02:11:17 +0100 |
parents | c53a49c345e1 |
children |
line wrap: on
line source
#!/bin/sh # # Use this script to generate empty.svndump # mkdir temp cd temp mkdir project-orig cd project-orig mkdir trunk mkdir branches mkdir tags cd .. svnadmin create svn-repo svnurl=file://`pwd`/svn-repo svn import project-orig $svnurl -m "init projA" svn co $svnurl project cd project mkdir trunk/dir echo a > trunk/dir/a svn add trunk/dir svn ci -m adddir echo b > trunk/b svn add trunk/b svn ci -m addb echo c > c svn add c svn ci -m addc cd .. # svnsync repo/trunk/dir only so the last two revisions are empty svnadmin create svn-empty cat > svn-empty/hooks/pre-revprop-change <<EOF #!/bin/sh exit 0 EOF chmod +x svn-empty/hooks/pre-revprop-change svnsync init --username svnsync file://`pwd`/svn-empty file://`pwd`/svn-repo/trunk/dir svnsync sync file://`pwd`/svn-empty svn log -v file://`pwd`/svn-empty svnadmin dump svn-empty > ../empty.svndump