blob: afdd014f2bcc67163eb7140704c917df3ec87ccb (
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
|
#!/bin/bash
set -e
autoimport=
. tests/lib
t-dependencies NO-DGIT GDR
t-tstunt-parsechangelog
t-setup-import gdr-convert-gbp-noarchive
: 'do a simple test'
cd $p
t-gdr-prep-new-upstream 2.1
git tag v2.1 upstream
t-some-changes before
t-git-debrebase quick
git checkout -b other
t-some-changes other '' -other
git checkout other
echo other-upstream-confict >>docs/README
git commit -m 'other-upstream-conflict' docs/README
t-git-debrebase quick
git checkout master
t-git-debrebase new-upstream 2.1
t-merge-conflicted-stripping-conflict-markers other docs/README
export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
t-expect-fail F:'docs/README' \
t-git-debrebase
# xxx want to test a nomerge from first walk analysis half
# xxx want to check wrecknotes appear
t-ok
|
