diff options
Diffstat (limited to 'tests/tests/gdr-diverge-nmu-dgit')
-rwxr-xr-x | tests/tests/gdr-diverge-nmu-dgit | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit index 02fb2f7..bb6a19f 100755 --- a/tests/tests/gdr-diverge-nmu-dgit +++ b/tests/tests/gdr-diverge-nmu-dgit @@ -10,9 +10,18 @@ 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 +git checkout -b nmu origin/master~0 t-git-next-date @@ -25,20 +34,12 @@ 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 - +git checkout master 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' \ |