File: merge_three_patches.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 (52 lines) | stat: -rw-r--r-- 977 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
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
#!/usr/bin/env bash
set -ev

rm -rf tempOld tempA tempB
mkdir tempOld tempA
cd tempOld
darcs initialize
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 A > foo
echo B >> foo
echo C >> foo
echo D >> foo
echo E >> foo
echo F >> foo
echo G >> foo
echo H >> foo
darcs add foo
darcs record -m Old
cd ..

cd tempA
darcs initialize
cp ../tempOld/_darcs/prefs/defaults _darcs/prefs
darcs pull ../tempOld
cp foo temp
cat temp | grep -v A | grep -v B | grep -v D | sed s/E/e/ \
    | grep -v G | sed s/H/h/ > foo
darcs record -m AA
cd ..

darcs get tempOld tempB
cd tempB
cp ../tempOld/_darcs/prefs/defaults _darcs/prefs
echo 7 > foo
darcs record -m BB
darcs pull ../tempA
darcs record -m "conflict resolution"
cd ..

cd tempA
darcs pull ../tempB
darcs annotate -p B
darcs annotate -p resolution
cd ..

cmp tempA/foo tempB/foo

rm -rf tempOld tempA tempB