diff options
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/tests/gdr-merge-conflicts | 4 | ||||
-rwxr-xr-x | tests/tests/mismatches-contents | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index 5a3f243..05b5480 100755 --- a/tests/tests/gdr-merge-conflicts +++ b/tests/tests/gdr-merge-conflicts @@ -63,8 +63,8 @@ git merge --no-edit -s ours other # we have to do a little dance to make this not a pseudomerge t-git-next-date -dch -a 'Merge, only conflict was in debian/changelog' -t-dch-r-rune dch +t-debchange -a 'Merge, only conflict was in debian/changelog' +t-dch-r-rune t-debchange git commit -a --amend --no-edit wreckage-before diff --git a/tests/tests/mismatches-contents b/tests/tests/mismatches-contents index ea0d724..e424016 100755 --- a/tests/tests/mismatches-contents +++ b/tests/tests/mismatches-contents @@ -11,7 +11,7 @@ ln -s $troot/pkg-srcs/${p}_${v%-*}.orig.tar.* . cd $p v=1.0-1 -dch -v $v -D unstable -m 'Make a revision' +t-debchange -v $v -D unstable -m 'Make a revision' echo foo >us-file git add us-file debian/changelog git commit -m "Commit $v" |