tests/test-evolve-orphan-split.t
author Raphaël Gomès <rgomes@octobus.net>
Tue, 06 Aug 2019 11:32:01 +0200
changeset 4807 ea8da5aa23c6
parent 4712 e2c548cc83b5
child 4777 ff452675566c
child 5197 143ac9ac77a3
permissions -rw-r--r--
python3: add raw prefix to open()-like functions
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
4455
b58e45aa9be2 test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4393
diff changeset
    22
An orphan changeset with parent got split
b58e45aa9be2 test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4393
diff changeset
    23
-----------------------------------------
3537
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
4712
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
    51
  examine changes to 'a'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
    52
  (enter ? for help) [Ynesfdaq?] y
3537
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    53
  
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    54
  @@ -0,0 +1,1 @@
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    55
  +foo
4712
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
    56
  record change 1/2 to 'a'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
    57
  (enter ? for help) [Ynesfdaq?] y
3537
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    58
  
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    59
  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
    60
  new file mode 100644
4712
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
    61
  examine changes to 'b'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
    62
  (enter ? for help) [Ynesfdaq?] n
3537
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    63
  
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    64
  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
    65
  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
    66
  1 new orphan changesets
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    67
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    68
  $ hg glog
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    69
  @  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
    70
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    71
  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
    72
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    73
  | *  2:86e1ebf1ca61 added c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    74
  | |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    75
  | 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
    76
  |/    () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    77
  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
    78
      () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    79
4576
96ce1030d2fb tests: add --update to hg evolve to reduce test changes for the next patch
Anton Shestakov <av6@dwimlabs.net>
parents: 4455
diff changeset
    80
  $ hg evolve --update
3537
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    81
  move:[2] added c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    82
  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
    83
  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
    84
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    85
  $ hg glog
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    86
  @  5:af13f0560b31 added c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    87
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    88
  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
    89
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    90
  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
    91
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    92
  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
    93
      () draft
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
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
    96
-----------------------------------------------------------------------
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    97
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
    98
  $ 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
    99
  3 changesets folded
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   100
  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
   101
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   102
  $ hg glog
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   103
  @  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
   104
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   105
  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
   106
      () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   107
  $ echo foo > d
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   108
  $ 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
   109
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   110
  $ hg glog
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   111
  @  7:d48a30875f01 added d
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   112
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   113
  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
   114
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   115
  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
   116
      () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   117
  $ hg prev
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   118
  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
   119
  [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
   120
  $ hg split -r . <<EOF
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
  > n
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   123
  > y
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   124
  > y
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   125
  > y
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   126
  > y
4294
8974a05a49fa split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4293
diff changeset
   127
  > c
3537
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   128
  > EOF
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   129
  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
   130
  adding a
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   131
  adding b
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   132
  adding c
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   133
  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
   134
  new file mode 100644
4712
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
   135
  examine changes to 'a'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
   136
  (enter ? for help) [Ynesfdaq?] y
3537
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
  @@ -0,0 +1,1 @@
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   139
  +foo
4712
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
   140
  record change 1/3 to 'a'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
   141
  (enter ? for help) [Ynesfdaq?] n
3537
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   142
  
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   143
  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
   144
  new file mode 100644
4712
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
   145
  examine changes to 'b'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
   146
  (enter ? for help) [Ynesfdaq?] y
3537
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   147
  
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   148
  @@ -0,0 +1,1 @@
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   149
  +foo
4712
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
   150
  record change 2/3 to 'b'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
   151
  (enter ? for help) [Ynesfdaq?] y
3537
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   152
  
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   153
  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
   154
  new file mode 100644
4712
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
   155
  examine changes to 'c'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
   156
  (enter ? for help) [Ynesfdaq?] y
3537
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
  @@ -0,0 +1,1 @@
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   159
  +foo
4712
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
   160
  record change 3/3 to 'c'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents: 4577
diff changeset
   161
  (enter ? for help) [Ynesfdaq?] y
3537
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   162
  
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   163
  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
   164
  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
   165
  1 new orphan changesets
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   166
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   167
  $ hg glog
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   168
  @  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
   169
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   170
  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
   171
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   172
  | *  7:d48a30875f01 added d
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   173
  | |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   174
  | 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
   175
  |/    () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   176
  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
   177
      () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   178
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   179
  $ 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
   180
  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
   181
  $ hg glog
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   182
  @  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
   183
  |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   184
  | 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
   185
  |/    () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   186
  | *  7:d48a30875f01 added d
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   187
  | |   () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   188
  | 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
   189
  |/    () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   190
  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
   191
      () draft
8b5093f333dc tests: add a test about evolve stabilizing orphan caused by splits
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
   192
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   193
  $ hg evolve --dry-run <<EOF
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   194
  > 1
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   195
  > EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   196
  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
   197
  choose an evolve destination:
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   198
  1: [f2632392aefe] added a b c
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   199
  2: [7f87764e5b64] added a b c
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   200
  q: quit the prompt
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   201
  enter the index of the revision you want to select: 1
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   202
  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
   203
  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
   204
  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
   205
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   206
  $ hg evolve --dry-run <<EOF
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   207
  > 2
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   208
  > EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   209
  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
   210
  choose an evolve destination:
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   211
  1: [f2632392aefe] added a b c
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   212
  2: [7f87764e5b64] added a b c
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   213
  q: quit the prompt
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   214
  enter the index of the revision you want to select: 2
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   215
  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
   216
  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
   217
  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
   218
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   219
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
   220
(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
   221
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   222
  $ 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
   223
  > foo
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   224
  > EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   225
  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
   226
  choose an evolve destination:
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   227
  1: [f2632392aefe] added a b c
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   228
  2: [7f87764e5b64] added a b c
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   229
  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
   230
  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
   231
  invalid value 'foo' entered for index
3543
93deeed63908 evolve: fix missing negation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3542
diff changeset
   232
  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
   233
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   234
  $ 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
   235
  > 4
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   236
  > EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   237
  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
   238
  choose an evolve destination:
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   239
  1: [f2632392aefe] added a b c
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   240
  2: [7f87764e5b64] added a b c
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   241
  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
   242
  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
   243
  invalid value '4' entered for index
3543
93deeed63908 evolve: fix missing negation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3542
diff changeset
   244
  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
   245
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   246
  $ 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
   247
  > -1
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   248
  > EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   249
  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
   250
  choose an evolve destination:
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   251
  1: [f2632392aefe] added a b c
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   252
  2: [7f87764e5b64] added a b c
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   253
  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
   254
  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
   255
  invalid value '-1' entered for index
3543
93deeed63908 evolve: fix missing negation
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3542
diff changeset
   256
  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
   257
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   258
  $ 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
   259
  > q
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   260
  > EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   261
  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
   262
  choose an evolve destination:
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   263
  1: [f2632392aefe] added a b c
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   264
  2: [7f87764e5b64] added a b c
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   265
  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
   266
  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
   267
  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
   268
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   269
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
   270
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   271
  $ 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
   272
  > 1
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   273
  > EOF
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   274
  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
   275
  choose an evolve destination:
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   276
  1: [f2632392aefe] added a b c
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   277
  2: [7f87764e5b64] added a b c
3541
bc47c09c9782 evolve: prompt user to select destination for stabilization in case of split
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3537
diff changeset
   278
  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
   279
  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
   280
  move:[7] added d
4393
159a4a6ded0b prompts: use 1-indexing in revselectionprompt()
Martin von Zweigbergk <martinvonz@google.com>
parents: 4294
diff changeset
   281
  atop:[8] added a b c