diff options
Diffstat (limited to 'tests/tests')
| -rwxr-xr-x | tests/tests/gdr-edits | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits index f5ca2a4..1d74da3 100755 --- a/tests/tests/gdr-edits +++ b/tests/tests/gdr-edits @@ -11,6 +11,17 @@ cd $p t-git-debrebase analyse |tee ../anal.1 cat ../anal.1 -: xxx +echo >>debian/zorkmid '// debian' +git add debian/zorkmid +git commit -m 'DEBIAN add zorkmid' + +echo >>src.c '// upstream' +git commit -a -m 'UPSTREAM edit src.c' + +for f in debian/zorkmid src.c; do + echo '// both!' >>$f + git add $f +done +git commit -m 'MIXED add boths' t-ok |