X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=c51c4a6146a50230fed33afc80a41f78e222a08c;hp=0b8836266fbfc1746a16a09a2d71c10205a19a06;hb=fa22d8f771e63ca6fc17dea716980aa0faaf8f2f;hpb=d3606ff36cbf24f80152c5848fefee0c62686486 diff --git a/tests/lib b/tests/lib index 0b883626..c51c4a61 100644 --- a/tests/lib +++ b/tests/lib @@ -534,6 +534,27 @@ t-gbp-unapplied-pq2qc () { git checkout patch-queue/$branch } +t-gbp-example-prep () { + t-archive example 1.0-1 + t-git-none + t-worktree 1.0 + + cd example + + t-dgit fetch + + git-checkout -b patch-queue/quilt-tip-2 patch-queue/quilt-tip + gbp pq rebase + + echo '/* some comment */' >>src.c + git add src.c + git commit -m 'Add a comment to an upstream file' + + t-gbp-unapplied-pq2qc + + t-commit 'some updates' 1.0-2 +} + t-commit () { local msg=$1 v=${2-1.$revision}