chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: clean_tree_check: Add a comment about modifed tracked files
[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 f7bf3d51f4469100034c22456c1b76086d5ada35..007c35b81d68a40dc071896d98bef400d4a9d3d5 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,39
+10,39
@@
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
-
-t-expect-fail E:'Not.*fast-forward' \
-git merge --ff-only dgit/dgit/sid
-
-: 'rebase nmu onto our branch'
+git checkout master
+t-nmu-causes-ff-fail
git checkout dgit/dgit/sid # detach
git checkout dgit/dgit/sid # detach
-t-expect-fail 'E:CONFLICT.*Commit
Debian 3\.0 \(quilt\) metadata
' \
+t-expect-fail 'E:CONFLICT.*Commit
patch queue
' \
git rebase master
git rebase --skip
git rebase master
git rebase --skip