blob: 9b283c0b7e328bf0b527c4973117247de819274c (
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
|
#!/bin/bash
set -e
. tests/lib
t-dependencies git-buildpackage libfile-fnmatch-perl faketime
t-setup-import gdr-convert-gbp
cd $p
: 'upstream hat'
new-upstream () {
uv=$1
t-git-next-date
git checkout make-upstream
git reset --hard upstream
t-make-new-upstream-tarball $uv
git push . make-upstream:upstream
git checkout master
t-git-next-date
}
new-upstream 2.1
: 'maintainer hat'
git branch startpoint
v=2.1-1
git checkout master
t-git-debrebase new-upstream-v0 $v
t-gdr-good laundered
t-git-debrebase stitch
t-gdr-good stitched
git branch ordinary
: 'with --anchor'
git reset --hard startpoint
t-git-debrebase analyse >../anal.anch
anchor=$(perl <../anal.anch -ne '
next unless m/^(\w+) Anchor\s/;
print $1,"\n";
exit;
')
t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream-v0 $v
t-gdr-good laundered
t-git-debrebase stitch
t-gdr-good stitched
git diff --quiet ordinary
t-ok
|