Merge branch 'darcs' into master
[git-darcs-import.git] / bench / many_conflicting_changes.sh
blob5b4869a917e4ccff18ea23cecac8fdb04502e1ad
1 #!/bin/sh
3 set -ev
5 rm -rf temp1 temp2
7 mkdir temp1
8 cd temp1
9 darcs init
10 echo ALL --ignore-times > _darcs/prefs/defaults
11 perl -e 'print "foo\nbar\n"x100' > foo
12 darcs rec -la -A foo -m addfoo
13 cd ..
14 cp -RPp temp1 temp2
16 cd temp1
17 rm foo
18 darcs rec -a -A foo -m modfoo
19 cd ..
21 cd temp2
22 perl -e 'print "foo\n"x100' > foo
23 darcs rec -a -A foo -m otherfoo
24 darcs pull -va ../temp1
26 cd ..
27 rm -rf temp1 temp2