chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: Start 2.5
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index 275d3ef3f2824e89dc64453f41a106d133f5619d..3ddb98051e85890572809e56172575275433e13f 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-778,7
+778,7
@@
t-git-pseudo-merge () {
git merge $git_pseuomerge_opts "$@"
}
git merge $git_pseuomerge_opts "$@"
}
-t-gbp-example-prep () {
+t-gbp-example-prep
-no-ff
() {
t-tstunt-parsechangelog
t-archive example 1.0-1
t-git-none
t-tstunt-parsechangelog
t-archive example 1.0-1
t-git-none
@@
-798,6
+798,10
@@
t-gbp-example-prep () {
t-gbp-unapplied-pq2qc
t-commit 'some updates' 1.0-2
t-gbp-unapplied-pq2qc
t-commit 'some updates' 1.0-2
+}
+
+t-gbp-example-prep () {
+ t-gbp-example-prep-no-ff
t-git-pseudo-merge \
-m 'Pseudo-merge to make descendant of archive' \
t-git-pseudo-merge \
-m 'Pseudo-merge to make descendant of archive' \