blob: 78b79e9b9bc74e1ba47c6d77a49c198b3074e8a5 (
plain)
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
|
#!/bin/bash
set -e
autoimport=
. tests/lib
t-dependencies GDR
t-tstunt-parsechangelog
t-setup-import gdr-convert-gbp-noarchive
cd $p
t-gdr-prep-new-upstream 2.1
git tag v2.1 upstream
t-some-changes before
t-git-debrebase quick
: ----- prepare LH branch -----
git checkout -b other
t-some-changes other '' -other
echo 'other-conflict' >>debian/zorkmid
git commit -m 'other-conflict' debian/zorkmid
: ----- prepare RH branch -----
git checkout master
t-some-changes us-1 '' -us
t-git-debrebase new-upstream 2.1
t-some-changes us-2 '' -us
echo 'us-conflict' >>debian/zorkmid
git commit -m 'us-conflict' debian/zorkmid
t-git-debrebase quick
: ----- introduce a vanilla merge -----
t-merge-conflicted-stripping-conflict-markers other debian/zorkmid
t-expect-fail E:'general two-parent merge' \
t-git-debrebase
t_gdr_xopts+=' --experimental-merge-resolution'
: ----- expect to be able to merge -----
t-git-debrebase
t-gdr-good laundered
t-refs-same-start
t-ref-head
t-git-debrebase
t-ref-head
t-git-debrebase scrap
t-some-changes after
t-git-debrebase
t-gdr-good laundered
t-dgit quilt-fixup
t-gdr-made-patches
t-ok
|
