1 # Mercurial sample session

     2 #

     3 # Isabelle Developer's Workshop 2009

     4 #

     5 

     6 # initialization

     7 cd ~

     8 mkdir alex

     9 mkdir florian

    10 

    11 cd ~/alex

    12 

    13 

    14 hg init playground

    15 cd playground

    16 echo "Hello World" > greeting

    17 hg add greeting

    18 hg commit

    19 hg log

    20 hg serve

    21 

    22 

    23 cd ~/florian

    24 

    25 hg clone ~/alex/playground

    26 cd playground

    27 hg log

    28 

    29 # Florian's changes that were hidden in a script:

    30 

    31 echo "fun greet str = \"Hello \" ^ str" > code_generator

    32 hg add code_generator

    33 hg ci -m "added code generator" -u haftmann

    34 echo "Hello Universe" > greeting

    35 hg ci -m "generalized scope of greeting" -u wenzelm

    36 echo "Hello Universe[simp]" > greeting

    37 hg ci -m "added [simp]" -u nipkow

    38 

    39 

    40 cd ~/alex

    41 

    42 hg log

    43 echo "Hello IDW" >> greeting

    44 hg ci -m "also greet the workshop"

    45 hg pull ~/florian/playground

    46 hg log

    47 hg glog

    48 

    49 

    50 hg pull ~/florian/playground

    51 hg up

    52 hg merge

    53 emacs greeting          # fix the conflict

    54 hg resolve -m greeting  # mark as resolved

    55 hg ci -m "merged"

    56 hg glog

    57 

    58