tests/test-evolve-orphan-split.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Mon, 24 Dec 2018 18:38:25 +0100
changeset 4320 b4bc185bcefb
parent 4294 8974a05a49fa
child 4363 a2fdbece7ce1
child 4393 159a4a6ded0b
permissions -rw-r--r--
branching: merge with stable
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3537
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     1
** Testing resolution of orphans by `hg evolve` where an obsolete changeset has
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     2
multiple successors **
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     3
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     4
  $ cat >> $HGRCPATH <<EOF
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     5
  > [ui]
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     6
  > interactive = True
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     7
  > [alias]
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     8
  > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}"
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
     9
  > [extensions]
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    10
  > rebase =
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    11
  > EOF
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    12
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    13
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    14
Repo Setup
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    15
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    16
  $ hg init repo
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    17
  $ cd repo
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    18
  $ echo ".*\.orig" > .hgignore
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    19
  $ hg add .hgignore
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    20
  $ hg ci -m "added hgignore"
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    21
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    22
An orphan changeset with parent got splitted
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    23
--------------------------------------------
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    24
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    25
  $ for ch in a b c; do echo foo > $ch; done;
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    26
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    27
  $ hg add a b
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    28
  $ hg ci -m "added a and b"
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    29
  $ hg add c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    30
  $ hg ci -m "added c"
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    31
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    32
  $ hg glog
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    33
  @  2:86e1ebf1ca61 added c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    34
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    35
  o  1:d0ddb614efbd added a and b
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    36
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    37
  o  0:8fa14d15e168 added hgignore
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    38
      () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    39
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    40
  $ hg split -r 1 <<EOF
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    41
  > y
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    42
  > y
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    43
  > n
4294
8974a05a49fa split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4293
diff changeset
    44
  > c
3537
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    45
  > EOF
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    46
  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    47
  adding a
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    48
  adding b
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    49
  diff --git a/a b/a
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    50
  new file mode 100644
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    51
  examine changes to 'a'? [Ynesfdaq?] y
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    52
  
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    53
  @@ -0,0 +1,1 @@
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    54
  +foo
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    55
  record change 1/2 to 'a'? [Ynesfdaq?] y
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    56
  
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    57
  diff --git a/b b/b
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    58
  new file mode 100644
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    59
  examine changes to 'b'? [Ynesfdaq?] n
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    60
  
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    61
  created new head
4294
8974a05a49fa split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4293
diff changeset
    62
  continue splitting? [Ycdq?] c
3537
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    63
  1 new orphan changesets
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    64
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    65
  $ hg glog
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    66
  @  4:8b179cffc81c added a and b
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    67
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    68
  o  3:bd3735d4dab0 added a and b
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    69
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    70
  | *  2:86e1ebf1ca61 added c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    71
  | |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    72
  | x  1:d0ddb614efbd added a and b
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    73
  |/    () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    74
  o  0:8fa14d15e168 added hgignore
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    75
      () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    76
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    77
  $ hg evolve
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    78
  move:[2] added c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    79
  atop:[4] added a and b
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    80
  working directory is now at af13f0560b31
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    81
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    82
  $ hg glog
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    83
  @  5:af13f0560b31 added c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    84
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    85
  o  4:8b179cffc81c added a and b
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    86
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    87
  o  3:bd3735d4dab0 added a and b
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    88
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    89
  o  0:8fa14d15e168 added hgignore
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    90
      () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    91
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    92
When the successors does not form a linear chain and are multiple heads
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    93
-----------------------------------------------------------------------
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    94
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    95
  $ hg fold -r .^^::. --exact -m "added a b c"
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    96
  3 changesets folded
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    97
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    98
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    99
  $ hg glog
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   100
  @  6:f89e4764f2ed added a b c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   101
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   102
  o  0:8fa14d15e168 added hgignore
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   103
      () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   104
  $ echo foo > d
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   105
  $ hg ci -Aqm "added d"
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   106
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   107
  $ hg glog
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   108
  @  7:d48a30875f01 added d
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   109
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   110
  o  6:f89e4764f2ed added a b c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   111
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   112
  o  0:8fa14d15e168 added hgignore
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   113
      () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   114
  $ hg prev
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   115
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   116
  [6] added a b c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   117
  $ hg split -r . <<EOF
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   118
  > y
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   119
  > n
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   120
  > y
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   121
  > y
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   122
  > y
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   123
  > y
4294
8974a05a49fa split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4293
diff changeset
   124
  > c
3537
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   125
  > EOF
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   126
  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   127
  adding a
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   128
  adding b
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   129
  adding c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   130
  diff --git a/a b/a
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   131
  new file mode 100644
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   132
  examine changes to 'a'? [Ynesfdaq?] y
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   133
  
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   134
  @@ -0,0 +1,1 @@
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   135
  +foo
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   136
  record change 1/3 to 'a'? [Ynesfdaq?] n
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   137
  
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   138
  diff --git a/b b/b
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   139
  new file mode 100644
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   140
  examine changes to 'b'? [Ynesfdaq?] y
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   141
  
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   142
  @@ -0,0 +1,1 @@
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   143
  +foo
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   144
  record change 2/3 to 'b'? [Ynesfdaq?] y
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   145
  
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   146
  diff --git a/c b/c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   147
  new file mode 100644
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   148
  examine changes to 'c'? [Ynesfdaq?] y
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   149
  
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   150
  @@ -0,0 +1,1 @@
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   151
  +foo
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   152
  record change 3/3 to 'c'? [Ynesfdaq?] y
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   153
  
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   154
  created new head
4294
8974a05a49fa split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4293
diff changeset
   155
  continue splitting? [Ycdq?] c
3537
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   156
  1 new orphan changesets
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   157
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   158
  $ hg glog
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   159
  @  9:c0fbf8aaf6c4 added a b c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   160
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   161
  o  8:f2632392aefe added a b c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   162
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   163
  | *  7:d48a30875f01 added d
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   164
  | |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   165
  | x  6:f89e4764f2ed added a b c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   166
  |/    () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   167
  o  0:8fa14d15e168 added hgignore
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   168
      () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   169
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   170
  $ hg rebase -r . -d 8fa14d15e168
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   171
  rebasing 9:c0fbf8aaf6c4 "added a b c" (tip)
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   172
  $ hg glog
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   173
  @  10:7f87764e5b64 added a b c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   174
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   175
  | o  8:f2632392aefe added a b c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   176
  |/    () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   177
  | *  7:d48a30875f01 added d
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   178
  | |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   179
  | x  6:f89e4764f2ed added a b c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   180
  |/    () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   181
  o  0:8fa14d15e168 added hgignore
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   182
      () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   183
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   184
  $ hg evolve --dry-run <<EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   185
  > 0
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   186
  > EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   187
  ancestor 'd48a30875f01' split over multiple topological branches.
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   188
  choose an evolve destination:
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   189
  0: [f2632392aefe] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   190
  1: [7f87764e5b64] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   191
  q: quit the prompt
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   192
  enter the index of the revision you want to select: 0
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   193
  move:[7] added d
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   194
  atop:[8] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   195
  hg rebase -r d48a30875f01 -d f2632392aefe
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   196
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   197
  $ hg evolve --dry-run <<EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   198
  > 1
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   199
  > EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   200
  ancestor 'd48a30875f01' split over multiple topological branches.
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   201
  choose an evolve destination:
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   202
  0: [f2632392aefe] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   203
  1: [7f87764e5b64] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   204
  q: quit the prompt
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   205
  enter the index of the revision you want to select: 1
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   206
  move:[7] added d
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   207
  atop:[10] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   208
  hg rebase -r d48a30875f01 -d 7f87764e5b64
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   209
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   210
Testing the interactive prompt with invalid values first
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   211
(this should move its own test file when we use it at multiple places)
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   212
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   213
  $ hg evolve --all <<EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   214
  > foo
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   215
  > EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   216
  ancestor 'd48a30875f01' split over multiple topological branches.
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   217
  choose an evolve destination:
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   218
  0: [f2632392aefe] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   219
  1: [7f87764e5b64] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   220
  q: quit the prompt
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   221
  enter the index of the revision you want to select: foo
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   222
  invalid value 'foo' entered for index
3543
93deeed63908 evolve: fix missing negation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3542
diff changeset
   223
  could not solve instability, ambiguous destination: parent split across two branches
3537
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   224
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   225
  $ hg evolve --all <<EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   226
  > 4
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   227
  > EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   228
  ancestor 'd48a30875f01' split over multiple topological branches.
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   229
  choose an evolve destination:
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   230
  0: [f2632392aefe] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   231
  1: [7f87764e5b64] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   232
  q: quit the prompt
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   233
  enter the index of the revision you want to select: 4
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   234
  invalid value '4' entered for index
3543
93deeed63908 evolve: fix missing negation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3542
diff changeset
   235
  could not solve instability, ambiguous destination: parent split across two branches
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   236
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   237
  $ hg evolve --all <<EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   238
  > -1
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   239
  > EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   240
  ancestor 'd48a30875f01' split over multiple topological branches.
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   241
  choose an evolve destination:
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   242
  0: [f2632392aefe] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   243
  1: [7f87764e5b64] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   244
  q: quit the prompt
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   245
  enter the index of the revision you want to select: -1
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   246
  invalid value '-1' entered for index
3543
93deeed63908 evolve: fix missing negation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3542
diff changeset
   247
  could not solve instability, ambiguous destination: parent split across two branches
3537
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   248
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   249
  $ hg evolve --all <<EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   250
  > q
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   251
  > EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   252
  ancestor 'd48a30875f01' split over multiple topological branches.
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   253
  choose an evolve destination:
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   254
  0: [f2632392aefe] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   255
  1: [7f87764e5b64] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   256
  q: quit the prompt
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   257
  enter the index of the revision you want to select: q
3543
93deeed63908 evolve: fix missing negation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3542
diff changeset
   258
  could not solve instability, ambiguous destination: parent split across two branches
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   259
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   260
Doing the evolve with the interactive prompt
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   261
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   262
  $ hg evolve --all <<EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   263
  > 1
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   264
  > EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   265
  ancestor 'd48a30875f01' split over multiple topological branches.
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   266
  choose an evolve destination:
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   267
  0: [f2632392aefe] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   268
  1: [7f87764e5b64] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   269
  q: quit the prompt
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   270
  enter the index of the revision you want to select: 1
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   271
  move:[7] added d
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   272
  atop:[10] added a b c
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   273
  working directory is now at 1c6caa7c902a