1 # basic operation

     1 # basic operation

     2 adding a

     2 adding a

     3 changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57

     4 changeset 2:b38a34ddfd9f backs out changeset 1:a820f4f40a57

     4 a

     5 a

     5 # file that was removed is recreated

     6 # file that was removed is recreated

     6 adding a

     7 adding a

     7 adding a

     8 adding a

    11 removing a

    12 removing a

    12 changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a

    13 changeset 3:0dd8a0ed5e99 backs out changeset 2:44cd84c7349a

    13 cat: a: No such file or directory

    14 cat: a: No such file or directory

    14 # backout with merge

    15 # backout with merge

    15 adding a

    16 adding a

    16 changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23

    18 changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23

    17 merging with changeset 2:b66ea5b77abb

    19 merging with changeset 2:b66ea5b77abb

    18 merging a

    20 merging a

    19 0 files updated, 1 files merged, 0 files removed, 0 files unresolved

    21 0 files updated, 1 files merged, 0 files removed, 0 files unresolved

    20 (branch merge, don't forget to commit)

    22 (branch merge, don't forget to commit)