[Pkg-bazaar-commits] ./bzr/unstable r921: - shell script to set up a weave merge test case

[Martin Pool]

------------------------------------------------------------
revno: 921
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-07-15 19:55:36 -0300
message:
  - shell script to set up a weave merge test case
added:
  tools/weavemerge.sh
-------------- next part --------------
=== added file 'tools/weavemerge.sh'
--- a/tools/weavemerge.sh	1970-01-01 00:00:00 +0000
+++ b/tools/weavemerge.sh	2005-07-15 22:55:36 +0000
@@ -0,0 +1,57 @@
+#! /bin/zsh -xe
+
+weave init test.weave
+
+weave add test.weave <<EOF
+aaa
+bbb
+ccc
+EOF
+
+weave add test.weave 0 <<EOF
+aaa
+bbb
+stuff from martin
+ccc
+ddd
+EOF
+
+weave add test.weave 0 <<EOF
+aaa
+bbb
+stuff from john
+more john stuff
+ccc
+EOF
+
+weave add test.weave 1 2 <<EOF
+aaa
+bbb
+stuff from martin
+fix up merge
+more john stuff
+ccc
+ddd
+EOF
+
+weave add test.weave 3 <<EOF
+aaa
+bbb
+stuff from martin
+fix up merge
+modify john's code
+ccc
+ddd
+add stuff here
+EOF
+
+# v5 
+weave add test.weave 2 <<EOF
+aaa
+bbb
+stuff from john
+more john stuff
+john replaced ccc line
+EOF
+
+# now try merging 5(2) with 4(3(2 1))
\ No newline at end of file