diff -r 05e5d68c9627 -r f1be8028a4a9 Nominal/activities/tphols09/IDW/AK-example_session
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Nominal/activities/tphols09/IDW/AK-example_session	Wed Mar 30 17:27:34 2016 +0100
@@ -0,0 +1,58 @@
+# Mercurial sample session
+#
+# Isabelle Developer's Workshop 2009
+#
+
+# initialization
+cd ~
+mkdir alex
+mkdir florian
+
+cd ~/alex
+
+
+hg init playground
+cd playground
+echo "Hello World" > greeting
+hg add greeting
+hg commit
+hg log
+hg serve
+
+
+cd ~/florian
+
+hg clone ~/alex/playground
+cd playground
+hg log
+
+# Florian's changes that were hidden in a script:
+
+echo "fun greet str = \"Hello \" ^ str" > code_generator
+hg add code_generator
+hg ci -m "added code generator" -u haftmann
+echo "Hello Universe" > greeting
+hg ci -m "generalized scope of greeting" -u wenzelm
+echo "Hello Universe[simp]" > greeting
+hg ci -m "added [simp]" -u nipkow
+
+
+cd ~/alex
+
+hg log
+echo "Hello IDW" >> greeting
+hg ci -m "also greet the workshop"
+hg pull ~/florian/playground
+hg log
+hg glog
+
+
+hg pull ~/florian/playground
+hg up
+hg merge
+emacs greeting          # fix the conflict
+hg resolve -m greeting  # mark as resolved
+hg ci -m "merged"
+hg glog
+
+