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
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
#!/bin/sh -e
##
## Basic test of rebase pull
##
## Copyright (C) 2011 Ganesh Sittampalam
##
## Permission is hereby granted, free of charge, to any person
## obtaining a copy of this software and associated documentation
## files (the "Software"), to deal in the Software without
## restriction, including without limitation the rights to use, copy,
## modify, merge, publish, distribute, sublicense, and/or sell copies
## of the Software, and to permit persons to whom the Software is
## furnished to do so, subject to the following conditions:
##
## The above copyright notice and this permission notice shall be
## included in all copies or substantial portions of the Software.
##
## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
## EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
## MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
## NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
## BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
## ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
## CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
## SOFTWARE.
. lib
rm -rf R1 R2 R3
mkdir R1
cd R1
darcs init
echo '1' > foo
darcs rec -lam "add foo"
cd ..
darcs get R1 R2
cd R2
echo '2' > foo
darcs rec -am "2"
cd ..
darcs get R1 R3
cd R3
echo '3' > foo
darcs rec -am "3"
echo '4' > foo
darcs rec -am "4"
# TODO: figure out behaviour of --all and test it
# (should it answer 'yes' to both pulling and suspending?
echo yyy | darcs rebase pull -a ../R2
darcs changes --count 2>&1 | grep "Rebase in progress: 2 suspended patches"
echo yny | darcs rebase unsuspend 2>log
grep conflicts log
cat > expected <<EOF
v v v v v v v
1
=============
2
*************
3
^ ^ ^ ^ ^ ^ ^
EOF
diff -u expected foo
echo 23 > foo
echo yyy | darcs amend --patch '3'
echo yy | darcs rebase unsuspend 2>log
grep conflicts log
cat > expected <<EOF
v v v v v v v
3
=============
23
*************
4
^ ^ ^ ^ ^ ^ ^
EOF
diff -u expected foo
echo 24 > foo
echo yyy | darcs amend --patch '4'
cd ..
|
