File: rmconflict.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 (24 lines) | stat: -rw-r--r-- 357 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
#!/usr/bin/env bash
set -ev

rm -rf tempA tempB
mkdir tempA tempB
cd tempA
darcs init
touch foo
darcs add foo
darcs record -a -m addA -A x
cd ../tempB
darcs init
darcs pull -a ../tempA
darcs remove foo
# rm foo
darcs record -a -m rmB -A x
cd ../tempA
darcs remove foo
darcs record -a -m rmA -A x
cd ../tempB
darcs pull -a ../tempA
cd ..
rm -rf tempA tempB