Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
+
+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)"
+}
t-git-debrebase analyse |tee ../anal.1
cat ../anal.1
t-git-debrebase analyse |tee ../anal.1
cat ../anal.1
-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'