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: gdr-newupstream: Add more dividers
[dgit.git]
/
tests
/
tests
/
gdr-newupstream
diff --git
a/tests/tests/gdr-newupstream
b/tests/tests/gdr-newupstream
index d72971a8dd6443b9655f66f34796fc671e94d3ac..59acca848343980edbe2d0b2d45aa350ae070a3f 100755
(executable)
--- a/
tests/tests/gdr-newupstream
+++ b/
tests/tests/gdr-newupstream
@@
-28,6
+28,8
@@
git tag v2.1 upstream
git branch before-new-upstream
git branch before-new-upstream
+: ----- ordinary new upstream test -----
+
t-git-debrebase new-upstream ${v%-*}
date=$(git log --format=%aD -n1 debian/changelog)
t-git-debrebase new-upstream ${v%-*}
date=$(git log --format=%aD -n1 debian/changelog)
@@
-50,7
+52,7
@@
t-gdr-good stitched
git branch ordinary
git branch ordinary
-:
'with --anchor'
+:
----- 'with --anchor' -----
git reset --hard startpoint
git reset --hard startpoint