tests/test-bookmarks-merge.t
author David Soria Parra <dsp@php.net>
Sat, 12 May 2012 21:28:10 +0200
changeset 16706 a270ec977ba6
child 16708 4a02cf4fbb2e
permissions -rw-r--r--
bookmarks: delete divergent bookmarks on merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
16706
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
     1
# init
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
     2
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
     3
  $ hg init
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
     4
  $ echo a > a
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
     5
  $ hg add a
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
     6
  $ hg commit -m'a'
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
     7
  $ echo b > b
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
     8
  $ hg add b
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
     9
  $ hg commit -m'b'
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    10
  $ hg up -C 0
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    11
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    12
  $ echo c > c
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    13
  $ hg add c
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    14
  $ hg commit -m'c'
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    15
  created new head
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    16
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    17
# test merging of diverged bookmarks
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    18
  $ hg bookmark -r 1 "c@diverge"
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    19
  $ hg bookmark -r 1 b
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    20
  $ hg bookmark c
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    21
  $ hg bookmarks
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    22
     b                         1:d2ae7f538514
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    23
   * c                         2:d36c0562f908
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    24
     c@diverge                 1:d2ae7f538514
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    25
  $ hg merge "c@diverge"
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    26
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    27
  (branch merge, don't forget to commit)
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    28
  $ hg commit -m'merge'
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    29
  $ hg bookmarks
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    30
     b                         1:d2ae7f538514
a270ec977ba6 bookmarks: delete divergent bookmarks on merge
David Soria Parra <dsp@php.net>
parents:
diff changeset
    31
   * c                         3:b8f96cf4688b