blob: 8bfbfc61b2ddadca5c5afbc56328aff3ec840bb0 (
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
|
#!/bin/bash
set -e
. tests/lib
t-dependencies git-buildpackage libfile-fnmatch-perl
t-setup-import gbp2gdr
cd $p
t-git-debrebase analyse |tee ../anal.1
cat ../anal.1
echo >>debian/zorkmid '// debian'
git add debian/zorkmid
git commit -m 'DEBIAN add zorkmid'
echo >>src.c '// upstream'
git commit -a -m 'UPSTREAM edit src.c'
for f in debian/zorkmid src.c; do
echo '// both!' >>$f
git add $f
done
git commit -m 'MIXED add boths'
git tag t.before
t-git-debrebase
git diff t.before -- ':.' ':!debian/patches'
t-git-debrebase stitch --prose=wombat
t-ok
|
