File: steve_and_monica_rollback.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 (38 lines) | stat: -rw-r--r-- 662 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
#!/bin/bash

#  Issue578: A conflict rollback case for Darcs2

set -ev

rm -rf tmp_steve tmp_monica

mkdir tmp_steve
mkdir tmp_monica

cd tmp_steve
darcs init  --darcs-2
echo A >foo
darcs add foo
darcs record -Asteve -am 'Anote'

echo B >foo
darcs record -Asteve -am 'Bnote'

# Show the history as Steve sees it.
darcs changes -s
echo "######"

cd ../tmp_monica
darcs init --darcs-2
echo A>foo
darcs add foo
echo Z>bar
darcs add bar
darcs record -Amonica -am 'AZnote'
darcs pull -a ../tmp_steve
darcs changes
echo "######"
darcs rollback -a -m newpatch -A me --match 'exact Anote'

# previous failure result: darcs failed:  cannot roll back a 'rollback' patch.