chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: test suite: gdr nmu divergence: do maintainer first
[dgit.git]
/
tests
/
tests
/
quilt
diff --git
a/tests/tests/quilt
b/tests/tests/quilt
index 4988b2b917ea871e6e436a5257c4dfe288d27351..f26f74458a27dc9ce5c592b9aac94897df6d4284 100755
(executable)
--- a/
tests/tests/quilt
+++ b/
tests/tests/quilt
@@
-41,8
+41,8
@@
iteration
diff <<END - debian/patches/series
ups-topic/ups-yml
diff <<END - debian/patches/series
ups-topic/ups-yml
-spongiform-upstream-new-file-incl-change
-zorkmid-options-=-42
+spongiform-upstream-new-file-incl-change
.patch
+zorkmid-options-=-42
.patch
END
for f in `cat debian/patches/series`; do
END
for f in `cat debian/patches/series`; do
@@
-60,7
+60,7
@@
t-git-next-date
git clean -xdf
# We need to make a patches-unapplied version
git clean -xdf
# We need to make a patches-unapplied version
-unpa=$(git
-
log --pretty=format:'%H' --grep '^\[dgit import unpatched')
+unpa=$(git
log --pretty=format:'%H' --grep '^\[dgit import unpatched')
git checkout -b for-gbp
git reset "$unpa" .
git reset HEAD debian
git checkout -b for-gbp
git reset "$unpa" .
git reset HEAD debian
@@
-93,4
+93,4
@@
do
mv ../this.cmp ../last.cmp
done
mv ../this.cmp ../last.cmp
done
-echo ok.
+t-ok