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
|
#!/usr/bin/env bash
set -ve
test $DARCS || DARCS=$PWD/../darcs
export DARCS_EMAIL=test
rm -rf tmp_d1 tmp_d2 tmp_d
# Preparations:
# Set up two repos, each with a patch (d1 and d2 respectively) with both
# an individual change and a change that is identical in both repos,
# and thus auto-merge, i.e., they don't conflict in darcs2. Pull them
# together and record a patch (problem) on top of the auto-merged change,
# so that it depends on EITHER of two patches.
mkdir tmp_d1; cd tmp_d1
$DARCS init --darcs-2
echo a > a
echo b > b
echo c > c
$DARCS rec -alm init
echo a-independent > a
echo c-common > c
$DARCS rec -am d1
cd ..
$DARCS get --to-patch init tmp_d1 tmp_d2
cd tmp_d2
echo b-independent > b
echo c-common > c
$DARCS rec -am d2
$DARCS pull -a ../tmp_d1
# no conflicts -- c-common is identical
echo c-problem > c
$DARCS rec -am problem
cd ..
# I want to pull the 'problem' patch, but expect darcs to get confused
# because it doesn't know how to select one of the two dependent patches.
$DARCS get --to-patch init ../tmp_d2 tmp_d
cd tmp_d
echo n/n/y |tr / \\012 |$DARCS pull ../tmp_d2
$DARCS cha
# This is weird, we got d2 though we said No. I would have expected
# darcs to skip the 'problem' patch in this case.
# Try to pull d1 and unpull d2.
$DARCS pull -a ../tmp_d1
echo n/y/d |tr / \\012 |$DARCS obl -p d2
# The obliterate fails with: patches to commute_to_end does not commutex (1)
cd ..
rm -rf tmp_d1 tmp_d2 tmp_d
|
