chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test suite: Factor out t-dch-commit-r
[dgit.git]
/
tests
/
tests
/
gdr-diverge-nmu-dgit
diff --git
a/tests/tests/gdr-diverge-nmu-dgit
b/tests/tests/gdr-diverge-nmu-dgit
index 02fb2f704481763303d55ac89c305ac32c8026cf..1d136a94b0bfb85751868d07417a72d7529b4c0b 100755
(executable)
--- a/
tests/tests/gdr-diverge-nmu-dgit
+++ b/
tests/tests/gdr-diverge-nmu-dgit
@@
-2,7
+2,7
@@
set -e
. tests/lib
set -e
. tests/lib
-t-dependencies
git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies
GDR
t-setup-import gdr-convert-gbp
t-setup-import gdr-convert-gbp
@@
-10,35
+10,36
@@
cd $p
t-dgit setup-mergechangelogs
t-dgit setup-mergechangelogs
+: 'maintainer'
+
+git checkout master
+
+v=2.0-3
+t-maintainer-commit-some-changes
+
+t-git-next-date
+
: 'nmu'
: 'nmu'
-git checkout -b 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-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 sid
+t-dch-commit
-r
t-dgit -wgf push-source
t-archive-process-incoming sid
t-dgit -wgf push-source
t-archive-process-incoming sid
-: 'maintainer'
-
-git checkout master
-
-v=2.0-3
-t-maintainer-commit-some-changes
+: 'rebase nmu onto our branch'
-t-dgit fetch
t-git-next-date
t-git-next-date
-
+git checkout master
t-nmu-causes-ff-fail
t-nmu-causes-ff-fail
-: 'rebase nmu onto our branch'
-
git checkout dgit/dgit/sid # detach
t-expect-fail 'E:CONFLICT.*Commit Debian 3\.0 \(quilt\) metadata' \
git checkout dgit/dgit/sid # detach
t-expect-fail 'E:CONFLICT.*Commit Debian 3\.0 \(quilt\) metadata' \