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: New record-resolved-merge subcommand, WIP
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index 2842ce8b6ea7d5e24b680be47835f1f22a734aff..e2496b43a0355d45f67fc345622df66705c8de33 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-675,6
+675,12
@@
t-push-was-source-only () {
done
}
done
}
+t-push-included () {
+ for f in $@; do
+ stat $tmp/incoming/$f
+ done
+}
+
t-pushed-good () {
local branch=$1
local suite=${2:-sid}
t-pushed-good () {
local branch=$1
local suite=${2:-sid}
@@
-702,6
+708,12
@@
t-pushed-good-core () {
git verify-tag `t-v-tag`
}
git verify-tag `t-v-tag`
}
+t-pushed-good-check-changes () {
+ changes_filename="$tmp/incoming/${p}_${v}_*.changes"
+ grep -E "^Distribution: $suite" $changes_filename
+ grep -E "^Version: $v" $changes_filename
+}
+
t-splitbrain-pushed-good--unpack () {
cd $tmp
rm -rf t-unpack
t-splitbrain-pushed-good--unpack () {
cd $tmp
rm -rf t-unpack
@@
-1013,6
+1025,18
@@
t-make-badcommit () {
t-expect-fsck-fail $badcommit
}
t-expect-fsck-fail $badcommit
}
+t-merge-conflicted-stripping-conflict-markers () {
+ local otherbranch=$1
+ local file=$2
+
+ t-expect-fail F:"Merge conflict in $file" \
+ git merge $otherbranch
+
+ perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' "$file"
+ git add "$file"
+ git commit --no-edit
+}
+
t-commit () {
local msg=$1
v=${2:-${majorv:-1}.$revision}
t-commit () {
local msg=$1
v=${2:-${majorv:-1}.$revision}
@@
-1138,6
+1162,10
@@
t-buildproductsdir-config () {
bpd=$tmp/bpd
t-git-config dgit.default.build-products-dir $bpd
mkdir -p $bpd
bpd=$tmp/bpd
t-git-config dgit.default.build-products-dir $bpd
mkdir -p $bpd
+ cat <<END >>$tmp/.gbp.conf
+[buildpackage]
+export-dir = $bpd
+END
}
t-restrict () {
}
t-restrict () {