File: mergeresolved.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 (57 lines) | stat: -rw-r--r-- 1,049 bytes parent folder | download | duplicates (2)
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
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
#!/usr/bin/env bash
set -ev

rm -rf fooOld tempA tempB
mkdir fooOld tempA tempB
cd fooOld
darcs init
echo record author me > _darcs/prefs/defaults
echo ALL all >> _darcs/prefs/defaults
#echo ALL verbose >> _darcs/prefs/defaults
echo ALL ignore-times >> _darcs/prefs/defaults
echo Old > foo
darcs add foo
darcs record -m Old
cd ..

cd tempA
darcs init
cp ../fooOld/_darcs/prefs/defaults _darcs/prefs
darcs pull ../fooOld
echo A > foo
darcs record -m AA
cd ..

cd tempB
darcs init
cp ../fooOld/_darcs/prefs/defaults _darcs/prefs
darcs pull ../fooOld
echo B > foo
darcs record -m BB
darcs pull ../tempA
echo A > foo
darcs record -m "ok A's fine."
cd ..

# At this point, tempB and tempA should agree--since the conflict was
# resolved in favor of tempA.
cmp tempB/foo tempA/foo

cd tempA
echo AA > foo
darcs record -m "AA -- upping the ante."
cd ..

cd tempB
darcs pull ../tempA
cd ..

cd tempA
darcs pull ../tempB
cd ..

# At this point, tempB and tempA should agree since we have pulled both ways.
cmp tempB/foo tempA/foo

rm -rf fooOld tempA tempB