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: merge: Comment about laundry of merge of unstitched
[dgit.git]
/
tests
/
lib-gdr
diff --git
a/tests/lib-gdr
b/tests/lib-gdr
index 7b43d4f2d7a42179483c16e6be9af07dc32992f1..849e3f642d5e6ae3385efab70c71421122f513c6 100644
(file)
--- a/
tests/lib-gdr
+++ b/
tests/lib-gdr
@@
-7,7
+7,8
@@
t-git-debrebase () {
local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase}
: '
{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase}
: '
{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
- $gdr --dgit=$DGIT_TEST $GDR_TEST_OPTS $GDR_TEST_DEBUG $t_gdr_xopts "$@"
+ $gdr "--dgit=${DGIT_TEST-dgit}" $GDR_TEST_OPTS \
+ $GDR_TEST_DEBUG $t_gdr_xopts "$@"
: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
'
}
: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
'
}
@@
-155,32
+156,34
@@
t-gdr-good () {
t-some-changes () {
local token=$1
t-some-changes () {
local token=$1
- local which=${2-dum}
+ local which=${2:-dum}
+ local fsuffix=$3
t-git-next-date
case "$which" in
*d*)
t-git-next-date
case "$which" in
*d*)
- echo >>debian/zorkmid "// debian $token"
- git add debian/zorkmid
- git commit -m "DEBIAN add zorkmid ($token)"
+ echo >>debian/zorkmid
$fsuffix
"// debian $token"
+ git add debian/zorkmid
$fsuffix
+ git commit -m "DEBIAN add zorkmid
$fsuffix
($token)"
;;
esac
case "$which" in
*u*)
;;
esac
case "$which" in
*u*)
- echo >>src.c "// upstream $token"
- git commit -a -m "UPSTREAM edit src.c ($token)"
+ echo >>src$fsuffix.c "// upstream $token"
+ git add src$fsuffix.c
+ git commit -m "UPSTREAM edit src$fsuffix.c ($token)"
;;
esac
case "$which" in
*m*)
;;
esac
case "$which" in
*m*)
- for f in debian/zorkmid
src
.c; do
+ for f in debian/zorkmid
$fsuffix src$fsuffix
.c; do
echo "// both! $token" >>$f
git add $f
done
echo "// both! $token" >>$f
git add $f
done
- git commit -m "MIXED add both ($token)"
+ git commit -m "MIXED add both
($fsuffix)
($token)"
;;
esac
;;
esac
@@
-288,3
+291,14
@@
t-nmu-reconciled-good () {
git checkout master
t-dgit -wgf quilt-fixup
}
git checkout master
t-dgit -wgf quilt-fixup
}
+
+t-gdr-prep-new-upstream () {
+ uv=$1
+ t-git-next-date
+ git checkout make-upstream
+ git reset --hard upstream
+ t-make-new-upstream-tarball $uv
+ git push . make-upstream:upstream
+ git checkout master
+ t-git-next-date
+}