diff options
Diffstat (limited to 'tests/lib-gdr')
-rw-r--r-- | tests/lib-gdr | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index f633307..4cfa62b 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -88,3 +88,20 @@ t-gdr-branch-structure () { done } + +t-some-changes () { + local token=$1 + + echo >>debian/zorkmid "// debian $token" + git add debian/zorkmid + git commit -m "DEBIAN add zorkmid ($token)" + + echo >>src.c "// upstream $token" + git commit -a -m "UPSTREAM edit src.c ($token)" + + for f in debian/zorkmid src.c; do + echo "// both! $token" >>$f + git add $f + done + git commit -m "MIXED add both ($token)" +} |