File: three_way_conflict.sh

package info (click to toggle)
darcs 2.0.2-3
  • links: PTS
  • area: main
  • in suites: lenny
  • size: 6,400 kB
  • ctags: 1,048
  • sloc: haskell: 24,937; perl: 9,736; sh: 3,369; ansic: 1,913; makefile: 17; xml: 14
file content (34 lines) | stat: -rw-r--r-- 542 bytes parent folder | download | duplicates (4)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
#!/usr/bin/env bash
set -ev

rm -rf temp1 temp2 temp3
mkdir -p temp1 temp2 temp3
cd temp1
darcs init
cd ../temp2
darcs init
cd ../temp3
darcs init

touch foo
darcs add foo
darcs record -a -A author -m add
darcs push -a ../temp2
darcs push -a ../temp1

echo A > foo
darcs record -a -A author -m AA
cd ../temp2
echo B > foo
darcs record -a -A author -m BB
cd ../temp1
echo C > foo
darcs record -a -A author -m CC

darcs pull -a ../temp2
darcs pull -a ../temp3

cd ../temp2
darcs pull -a ../temp3
darcs pull -a ../temp1
rm -rf temp1 temp2 temp3