blob: ad39577a4ab2c7d07323cacb6cadfcfdcf944213 (
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
|
#!/bin/bash
set -e
. tests/lib
t-dependencies GDR
t-setup-import gdr-convert-gbp
cd $p
t-dgit setup-mergechangelogs
: 'maintainer'
git checkout master
v=2.0-3
t-maintainer-commit-some-changes
t-git-next-date
: 'nmu'
git checkout -b nmu origin/master~0
t-git-next-date
v=2.0-2+nmu1
t-nmu-commit-an-upstream-change
t-dch-commit -v$v -m finalise
t-dch-commit-r
t-dgit -wgf push-source
t-archive-process-incoming sid
: 'rebase nmu onto our branch'
t-git-next-date
git checkout master
t-nmu-causes-ff-fail
git checkout dgit/dgit/sid # detach
t-expect-fail 'E:CONFLICT.*Commit (patch queue|Debian 3\.0 \(quilt\) metadata)' \
git rebase master
git rebase --skip
git push . HEAD:master
git checkout master
t-nmu-reconciled-good nmu
t-ok
|