tests/conflict-fight-failure.sh

   1 #!/bin/env bash
   2 #
   3 # Test darcs conflict fight scenario.
   4 #
   5 # Set up two repos RA and RB. Create conflict in RB.
   6 # After resolving conflict in RB, pull new patch from RA.
   7 # Repeat, rinse.
   8 #
   9 # Author: Pekka Pessi
  10 #
  11
  12 set -ev
  13
  14 record="record --ignore-time --all --author X"
  15
  16 rm -rf RA RB
  17 mkdir RA
  18
  19 cd RA
  20 echo 0 > file
  21 darcs init
  22 darcs add file
  23 darcs $record -m0 file
  24 cd ..
  25
  26 darcs get RA RB
  27
  28 # Create conflict in RB
  29 cd RB
  30 echo let it b > file
  31 darcs $record -m B
  32 cd ..
  33
  34 for i in 1 2 3 4 5 # 6 7 8 9 10 11 12
  35 do
  36   echo Create new patch A$i in RA
  37   cd RA
  38   echo a$i > file
  39   darcs $record -m A$i
  40   cd ..
  41
  42   echo Pull patch A$i from RA and get a conflict
  43   cd RB
  44   time darcs pull ../RA --verbose --all --patch "^A$i\$"
  45   cd ..
  46
  47   echo Resolve conflict and start fighting by recording B$i
  48   cd RB
  49   echo let it b > file
  50   darcs $record -m B$i
  51   cd ..
  52 done
  53
  54 rm -rf RA RB