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-edits
diff --git
a/tests/tests/gdr-edits
b/tests/tests/gdr-edits
index 52c083b9fd427d1b9107735b654ad0c9451f5caf..0bdf15fd98d472dce037618a04a723d4485b7dce 100755
(executable)
--- a/
tests/tests/gdr-edits
+++ b/
tests/tests/gdr-edits
@@
-4,6
+4,7
@@
set -e
t-dependencies GDR
t-dependencies GDR
+t-tstunt-parsechangelog
t-setup-import gdr-convert-gbp
cd $p
t-setup-import gdr-convert-gbp
cd $p
@@
-37,4
+38,11
@@
t-refs-same-start
t-ref-same refs/heads/before-noop
t-ref-head
t-ref-same refs/heads/before-noop
t-ref-head
+git checkout -b some-new-branch
+t-some-changes 2nd-maintainer
+t-dgit quilt-fixup
+t-gdr-made-patches
+# NB quilt-fixup doesn't always manage to call gdr;
+# push does, since it will make the pseudomerge first
+
t-ok
t-ok