tests/test-evolve.t
author Martin von Zweigbergk <martinvonz@google.com>
Thu, 09 May 2019 09:42:51 -0700
changeset 4642 a7c4f163656b
parent 4625 a4fde4e3e763
child 4672 653c42af172e
child 4676 b6c819facbe8
child 4763 184c64c81528
permissions -rw-r--r--
cmdrewrite: use context manager for some locks and transactions These were the trivial cases where I didn't even need to extend the scope of a transaction or change indentation to fix it.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     1
  $ cat >> $HGRCPATH <<EOF
113
3bdabdbb4140 adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 94
diff changeset
     2
  > [defaults]
3bdabdbb4140 adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 94
diff changeset
     3
  > amend=-d "0 0"
915
1ebe5c51919b fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 901
diff changeset
     4
  > fold=-d "0 0"
1685
4fd0db2f6d84 commands: introduce a new command to edit commit metadata
Siddharth Agarwal <sid0@fb.com>
parents: 1673
diff changeset
     5
  > metaedit=-d "0 0"
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     6
  > [web]
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     7
  > push_ssl = false
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
     8
  > allow_push = *
113
3bdabdbb4140 adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 94
diff changeset
     9
  > [phases]
3bdabdbb4140 adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 94
diff changeset
    10
  > publish = False
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    11
  > [alias]
113
3bdabdbb4140 adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 94
diff changeset
    12
  > qlog = log --template='{rev} - {node|short} {desc} ({phase})\n'
82
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
    13
  > [diff]
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
    14
  > git = 1
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
    15
  > unified = 0
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    16
  > [extensions]
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    17
  > EOF
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1785
diff changeset
    18
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    19
  $ mkcommit() {
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    20
  >    echo "$1" > "$1"
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    21
  >    hg add "$1"
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    22
  >    hg ci -m "add $1"
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    23
  > }
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
    24
1358
3f5db977d46f evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1357
diff changeset
    25
  $ mkstack() {
3f5db977d46f evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1357
diff changeset
    26
  >    # Creates a stack of commit based on $1 with messages from $2, $3 ..
3f5db977d46f evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1357
diff changeset
    27
  >    hg update $1 -C
3f5db977d46f evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1357
diff changeset
    28
  >    shift
3f5db977d46f evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1357
diff changeset
    29
  >    mkcommits $*
3f5db977d46f evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1357
diff changeset
    30
  > }
3f5db977d46f evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1357
diff changeset
    31
296
c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents: 269
diff changeset
    32
  $ glog() {
2776
4dd84054ebbb test: remove reference to the graphlog extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2767
diff changeset
    33
  >   hg log -G --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@"
296
c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents: 269
diff changeset
    34
  > }
c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents: 269
diff changeset
    35
1358
3f5db977d46f evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1357
diff changeset
    36
  $ shaof() {
3f5db977d46f evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1357
diff changeset
    37
  >   hg log -T {node} -r "first(desc($1))"
3f5db977d46f evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1357
diff changeset
    38
  > }
3f5db977d46f evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1357
diff changeset
    39
3f5db977d46f evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1357
diff changeset
    40
  $ mkcommits() {
3f5db977d46f evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1357
diff changeset
    41
  >   for i in $@; do mkcommit $i ; done
3f5db977d46f evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1357
diff changeset
    42
  > }
3f5db977d46f evolve: add a more complex test for evolve --rev
Laurent Charignon <lcharignon@fb.com>
parents: 1357
diff changeset
    43
1414
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    44
Test the evolution test topic is installed
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    45
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    46
  $ hg help evolution
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    47
  Safely Rewriting History
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    48
  """"""""""""""""""""""""
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    49
  
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    50
      Obsolescence markers make it possible to mark changesets that have been
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    51
      deleted or superset in a new version of the changeset.
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    52
  
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    53
      Unlike the previous way of handling such changes, by stripping the old
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    54
      changesets from the repository, obsolescence markers can be propagated
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    55
      between repositories. This allows for a safe and simple way of exchanging
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    56
      mutable history and altering it after the fact. Changeset phases are
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    57
      respected, such that only draft and secret changesets can be altered (see
1709
989ed2f30d41 help: fix evolution hg phases reference
timeless@gmail.com
parents: 1686
diff changeset
    58
      'hg help phases' for details).
1414
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    59
  
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    60
      Obsolescence is tracked using "obsolete markers", a piece of metadata
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    61
      tracking which changesets have been made obsolete, potential successors
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    62
      for a given changeset, the moment the changeset was marked as obsolete,
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    63
      and the user who performed the rewriting operation. The markers are stored
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    64
      separately from standard changeset data can be exchanged without any of
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    65
      the precursor changesets, preventing unnecessary exchange of obsolescence
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    66
      data.
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    67
  
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    68
      The complete set of obsolescence markers describes a history of changeset
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    69
      modifications that is orthogonal to the repository history of file
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    70
      modifications. This changeset history allows for detection and automatic
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    71
      resolution of edge cases arising from multiple users rewriting the same
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    72
      part of history concurrently.
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    73
  
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    74
      Current feature status
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    75
      ======================
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    76
  
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    77
      This feature is still in development.  If you see this help, you have
1710
aec233d3cafd help: fix evolution help grammar
timeless@gmail.com
parents: 1709
diff changeset
    78
      enabled an extension that turned this feature on.
1414
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    79
  
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    80
      Obsolescence markers will be exchanged between repositories that
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    81
      explicitly assert support for the obsolescence feature (this can currently
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
    82
      only be done via an extension).
2782
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
    83
  
4471
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
    84
      Instability
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
    85
      ===========
2782
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
    86
  
4471
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
    87
      Rewriting changesets might introduce instability.
2782
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
    88
  
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
    89
      There are two main kinds of instability: orphaning and diverging.
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
    90
  
4471
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
    91
      Orphans are changesets left behind when their ancestors are rewritten.
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
    92
      Divergence has two variants:
2782
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
    93
  
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
    94
      * Content-divergence occurs when independent rewrites of the same
4471
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
    95
        changesets lead to different results.
2782
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
    96
      * Phase-divergence occurs when the old (obsolete) version of a changeset
4471
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
    97
        becomes public.
2782
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
    98
  
4471
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
    99
      It is possible to prevent local creation of orphans by using the following
2782
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
   100
      config:
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
   101
  
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
   102
        [experimental]
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
   103
        evolution=createmarkers,allnewcommands,exchange
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
   104
  
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
   105
      You can also enable that option explicitly:
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
   106
  
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
   107
        [experimental]
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
   108
        evolution=createmarkers,allnewcommands,allowunstable,exchange
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
   109
  
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
   110
      or simply:
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
   111
  
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
   112
        [experimental]
2bd0b0996cfb evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2776
diff changeset
   113
        evolution=all
1414
4198e2fad6ba evolve: add an help topic about evolution
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1410
diff changeset
   114
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   115
various init
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   116
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   117
  $ hg init local
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   118
  $ cd local
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   119
  $ mkcommit a
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   120
  $ mkcommit b
113
3bdabdbb4140 adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 94
diff changeset
   121
  $ cat >> .hg/hgrc << EOF
3bdabdbb4140 adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 94
diff changeset
   122
  > [phases]
3bdabdbb4140 adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 94
diff changeset
   123
  > publish = True
3bdabdbb4140 adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 94
diff changeset
   124
  > EOF
3bdabdbb4140 adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 94
diff changeset
   125
  $ hg pull -q . # make 1 public
3bdabdbb4140 adapt evolution to phase in core.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 94
diff changeset
   126
  $ rm .hg/hgrc
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   127
  $ mkcommit c
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   128
  $ mkcommit d
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   129
  $ hg up 1
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   130
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   131
  $ mkcommit e -q
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   132
  created new head
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   133
  $ mkcommit f
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   134
  $ hg qlog
137
bbc653876876 fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 116
diff changeset
   135
  5 - e44648563c73 add f (draft)
bbc653876876 fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 116
diff changeset
   136
  4 - fbb94e3a0ecf add e (draft)
bbc653876876 fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 116
diff changeset
   137
  3 - 47d2a3944de8 add d (draft)
bbc653876876 fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 116
diff changeset
   138
  2 - 4538525df7e2 add c (draft)
bbc653876876 fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 116
diff changeset
   139
  1 - 7c3bad9141dc add b (public)
bbc653876876 fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 116
diff changeset
   140
  0 - 1f0dee641bb7 add a (public)
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   141
414
299af91b8b6e evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents: 317
diff changeset
   142
test kill and immutable changeset
299af91b8b6e evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents: 317
diff changeset
   143
299af91b8b6e evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents: 317
diff changeset
   144
  $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1731
diff changeset
   145
  1 public 
1631
7463f5880ce9 prune: remove the kill alias
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1594
diff changeset
   146
  $ hg prune 1
4445
0f2305921e4d prune: use action "prune", not "touch", in precheck
Martin von Zweigbergk <martinvonz@google.com>
parents: 4344
diff changeset
   147
  abort: cannot prune public changesets: 7c3bad9141dc
1756
a7dcfff8c4a9 evolve: use single quotes in usage messages
Martin von Zweigbergk <martinvonz@google.com>
parents: 1753
diff changeset
   148
  (see 'hg help phases' for details)
444
aedb6b8ace86 drop repo.addobsolete
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 443
diff changeset
   149
  [255]
414
299af91b8b6e evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents: 317
diff changeset
   150
  $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1731
diff changeset
   151
  1 public 
414
299af91b8b6e evolve: tweak and add EOL to kill warning
Patrick Mezard <patrick@mezard.eu>
parents: 317
diff changeset
   152
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   153
test simple kill
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   154
317
c099ed0dd472 evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 309
diff changeset
   155
  $ hg id -n
c099ed0dd472 evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 309
diff changeset
   156
  5
1631
7463f5880ce9 prune: remove the kill alias
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1594
diff changeset
   157
  $ hg prune .
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   158
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4613
30a544904238 messages: standardize on "working copy is now at" including "is"
Martin von Zweigbergk <martinvonz@google.com>
parents: 4587
diff changeset
   159
  working directory is now at fbb94e3a0ecf
1239
8a06b32061ce evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents: 1197
diff changeset
   160
  1 changesets pruned
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   161
  $ hg qlog
137
bbc653876876 fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 116
diff changeset
   162
  4 - fbb94e3a0ecf add e (draft)
bbc653876876 fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 116
diff changeset
   163
  3 - 47d2a3944de8 add d (draft)
bbc653876876 fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 116
diff changeset
   164
  2 - 4538525df7e2 add c (draft)
bbc653876876 fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 116
diff changeset
   165
  1 - 7c3bad9141dc add b (public)
bbc653876876 fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 116
diff changeset
   166
  0 - 1f0dee641bb7 add a (public)
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   167
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   168
test multiple kill
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   169
1631
7463f5880ce9 prune: remove the kill alias
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1594
diff changeset
   170
  $ hg prune 4 -r 3
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   171
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4613
30a544904238 messages: standardize on "working copy is now at" including "is"
Martin von Zweigbergk <martinvonz@google.com>
parents: 4587
diff changeset
   172
  working directory is now at 7c3bad9141dc
1239
8a06b32061ce evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents: 1197
diff changeset
   173
  2 changesets pruned
81
5cec25ce019c Basic kill command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
   174
  $ hg qlog
137
bbc653876876 fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 116
diff changeset
   175
  2 - 4538525df7e2 add c (draft)
bbc653876876 fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 116
diff changeset
   176
  1 - 7c3bad9141dc add b (public)
bbc653876876 fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 116
diff changeset
   177
  0 - 1f0dee641bb7 add a (public)
317
c099ed0dd472 evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 309
diff changeset
   178
c099ed0dd472 evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 309
diff changeset
   179
test kill with dirty changes
c099ed0dd472 evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 309
diff changeset
   180
c099ed0dd472 evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 309
diff changeset
   181
  $ hg up 2
c099ed0dd472 evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 309
diff changeset
   182
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c099ed0dd472 evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 309
diff changeset
   183
  $ echo 4 > g
c099ed0dd472 evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 309
diff changeset
   184
  $ hg add g
1631
7463f5880ce9 prune: remove the kill alias
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1594
diff changeset
   185
  $ hg prune .
317
c099ed0dd472 evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 309
diff changeset
   186
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4613
30a544904238 messages: standardize on "working copy is now at" including "is"
Martin von Zweigbergk <martinvonz@google.com>
parents: 4587
diff changeset
   187
  working directory is now at 7c3bad9141dc
1239
8a06b32061ce evolve: apply prune update before creating obsolescence markers
Laurent Charignon <lcharignon@fb.com>
parents: 1197
diff changeset
   188
  1 changesets pruned
317
c099ed0dd472 evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 309
diff changeset
   189
  $ hg st
c099ed0dd472 evolve: improve kill testing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 309
diff changeset
   190
  A g
1279
064cf9ee4460 debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1197
diff changeset
   191
064cf9ee4460 debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1197
diff changeset
   192
Smoketest debugobsrelsethashtree:
064cf9ee4460 debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1197
diff changeset
   193
064cf9ee4460 debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1197
diff changeset
   194
  $ hg debugobsrelsethashtree
064cf9ee4460 debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1197
diff changeset
   195
  1f0dee641bb7258c56bd60e93edfa2405381c41e 0000000000000000000000000000000000000000
064cf9ee4460 debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1197
diff changeset
   196
  7c3bad9141dcb46ff89abf5f61856facd56e476c * (glob)
064cf9ee4460 debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1197
diff changeset
   197
  4538525df7e2b9f09423636c61ef63a4cb872a2d * (glob)
064cf9ee4460 debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1197
diff changeset
   198
  47d2a3944de8b013de3be9578e8e344ea2e6c097 * (glob)
064cf9ee4460 debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1197
diff changeset
   199
  fbb94e3a0ecf6d20c2cc31152ef162ce45af982f * (glob)
064cf9ee4460 debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1197
diff changeset
   200
  e44648563c73f75950076031c6fdf06629de95f1 * (glob)
064cf9ee4460 debugobsrelsethashtree: get the command to work again
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1197
diff changeset
   201
2083
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1806
diff changeset
   202
Smoketest stablerange.obshash:
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1806
diff changeset
   203
2230
a202f3af890c debugobshashrange: add a --subranges option
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2229
diff changeset
   204
  $ hg debugobshashrange --subranges --rev 'head()'
2228
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2083
diff changeset
   205
           rev         node        index         size        depth      obshash
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2083
diff changeset
   206
             1 7c3bad9141dc            0            2            2 * (glob)
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2083
diff changeset
   207
             0 1f0dee641bb7            0            1            1 000000000000
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2083
diff changeset
   208
             1 7c3bad9141dc            1            1            2 * (glob)
2083
778afb036245 discovery: introduce a official 'obshash associated to a range
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1806
diff changeset
   209
82
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   210
  $ cd ..
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   211
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   212
##########################
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   213
importing Parren test
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   214
##########################
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   215
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   216
  $ cat << EOF >> $HGRCPATH
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   217
  > [ui]
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   218
  > logtemplate = "{rev}\t{bookmarks}: {desc|firstline} - {author|user}\n"
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   219
  > EOF
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   220
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   221
Creating And Updating Changeset
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   222
===============================
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   223
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   224
Setup the Base Repo
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   225
-------------------
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   226
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   227
We start with a plain base repo::
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   228
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   229
  $ hg init main; cd main
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   230
  $ cat >main-file-1 <<-EOF
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   231
  > One
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   232
  > 
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   233
  > Two
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   234
  > 
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   235
  > Three
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   236
  > EOF
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   237
  $ echo Two >main-file-2
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   238
  $ hg add
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   239
  adding main-file-1
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   240
  adding main-file-2
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   241
  $ hg commit --message base
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   242
  $ cd ..
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   243
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   244
and clone this into a new repo where we do our work::
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   245
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   246
  $ hg clone main work
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   247
  updating to branch default
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   248
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   249
  $ cd work
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   250
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   251
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   252
Create First Patch
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   253
------------------
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   254
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   255
To begin with, we just do the changes that will be the initial version of the changeset::
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   256
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   257
  $ echo One >file-from-A
88
64fe5a4f877e [evolution] first workign draft of a relocate function
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 87
diff changeset
   258
  $ sed -i'' -e s/One/Eins/ main-file-1
82
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   259
  $ hg add file-from-A
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   260
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   261
So this is what we would like our changeset to be::
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   262
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   263
  $ hg diff
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   264
  diff --git a/file-from-A b/file-from-A
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   265
  new file mode 100644
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   266
  --- /dev/null
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   267
  +++ b/file-from-A
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   268
  @@ -0,0 +1,1 @@
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   269
  +One
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   270
  diff --git a/main-file-1 b/main-file-1
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   271
  --- a/main-file-1
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   272
  +++ b/main-file-1
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   273
  @@ -1,1 +1,1 @@
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   274
  -One
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   275
  +Eins
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   276
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   277
To commit it we just - commit it::
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   278
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   279
  $ hg commit --message "a nifty feature"
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   280
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   281
and place a bookmark so we can easily refer to it again (which we could have done before the commit)::
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   282
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   283
  $ hg book feature-A
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   284
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   285
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   286
Create Second Patch
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   287
-------------------
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   288
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   289
Let's do this again for the second changeset::
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   290
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   291
  $ echo Two >file-from-B
88
64fe5a4f877e [evolution] first workign draft of a relocate function
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 87
diff changeset
   292
  $ sed -i'' -e s/Two/Zwie/ main-file-1
82
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   293
  $ hg add file-from-B
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   294
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   295
Before committing, however, we need to switch to a new bookmark for the second
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   296
changeset. Otherwise we would inadvertently move the bookmark for our first changeset.
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   297
It is therefore advisable to always set the bookmark before committing::
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   298
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   299
  $ hg book feature-B
1105
836c4128c027 test: add parent hash to commit message in test-evolve.t
Matt Harbison <matt_harbison@yahoo.com>
parents: 1104
diff changeset
   300
  $ hg commit --message "another feature (child of $(hg log -r . -T '{node|short}'))"
82
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   301
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   302
So here we are::
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   303
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   304
  $ hg book
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   305
     feature-A                 1:568a468b60fc
1105
836c4128c027 test: add parent hash to commit message in test-evolve.t
Matt Harbison <matt_harbison@yahoo.com>
parents: 1104
diff changeset
   306
   * feature-B                 2:73296a82292a
82
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   307
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   308
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   309
Fix The Second Patch
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   310
--------------------
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   311
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   312
There's a typo in feature-B. We spelled *Zwie* instead of *Zwei*::
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   313
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   314
  $ hg diff --change tip | grep -F Zwie
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   315
  +Zwie
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   316
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   317
Fixing this is very easy. Just change::
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   318
88
64fe5a4f877e [evolution] first workign draft of a relocate function
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 87
diff changeset
   319
  $ sed -i'' -e s/Zwie/Zwei/ main-file-1
82
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   320
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   321
and **amend**::
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   322
741
892a6d708c8f amend: drop the deprecated note option
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 718
diff changeset
   323
  $ hg amend
82
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   324
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   325
This results in a new single changeset for our amended changeset, and the old
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   326
changeset plus the updating changeset are hidden from view by default::
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   327
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   328
  $ hg log
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   329
  3	feature-B: another feature (child of 568a468b60fc) - test
82
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   330
  1	feature-A: a nifty feature - test
8108d566a8b5 [evolution] imported hg amend from parren works
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 81
diff changeset
   331
  0	: base - test
87
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 82
diff changeset
   332
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 82
diff changeset
   333
  $ hg up feature-A -q
139
9b9500175ae5 evolve that does something \o/
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 138
diff changeset
   334
  $ hg bookmark -i feature-A
88
64fe5a4f877e [evolution] first workign draft of a relocate function
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 87
diff changeset
   335
  $ sed -i'' -e s/Eins/Un/ main-file-1
87
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 82
diff changeset
   336
475
9f69a5e41ab0 [evolve] amend: check phase before starting the transition
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 474
diff changeset
   337
(amend of public changeset denied)
9f69a5e41ab0 [evolve] amend: check phase before starting the transition
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 474
diff changeset
   338
474
5c031e1c90e2 test: turn the base public
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 418
diff changeset
   339
  $ hg phase --public 0 -v
5c031e1c90e2 test: turn the base public
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 418
diff changeset
   340
  phase changed for 1 changesets
475
9f69a5e41ab0 [evolve] amend: check phase before starting the transition
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 474
diff changeset
   341
9f69a5e41ab0 [evolve] amend: check phase before starting the transition
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 474
diff changeset
   342
476
f17a0f801e0b [evolve] amend: display proper error message while trying to amend non ancestor
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 475
diff changeset
   343
(amend of on ancestors)
f17a0f801e0b [evolve] amend: display proper error message while trying to amend non ancestor
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 475
diff changeset
   344
741
892a6d708c8f amend: drop the deprecated note option
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 718
diff changeset
   345
  $ hg amend
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   346
  1 new orphan changesets
87
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 82
diff changeset
   347
  $ hg log
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   348
  4	feature-A: a nifty feature - test
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   349
  3	feature-B: another feature (child of 568a468b60fc) - test
87
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 82
diff changeset
   350
  1	: a nifty feature - test
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 82
diff changeset
   351
  0	: base - test
302
d68ccae92d52 obsolete: make collapse create less markers
Patrick Mezard <patrick@mezard.eu>
parents: 296
diff changeset
   352
  $ hg up -q 0
296
c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents: 269
diff changeset
   353
  $ glog --hidden
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   354
  o  4:ba0ec09b1bab@default(draft) a nifty feature
296
c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents: 269
diff changeset
   355
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
   356
  | *  3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
296
c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents: 269
diff changeset
   357
  | |
1104
cb36a4eb0157 evolve: fix the 'grab' alias to work on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 1099
diff changeset
   358
  | | x  2:73296a82292a@default(draft) another feature (child of 568a468b60fc)
296
c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents: 269
diff changeset
   359
  | |/
346
f4302a2079f4 tests: update graphlog output after hg@2e13c1bd34dc
Patrick Mezard <patrick@mezard.eu>
parents: 317
diff changeset
   360
  | x  1:568a468b60fc@default(draft) a nifty feature
296
c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents: 269
diff changeset
   361
  |/
474
5c031e1c90e2 test: turn the base public
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 418
diff changeset
   362
  @  0:e55e0562ee93@default(public) base
296
c3ff47e6bd36 test-evolve: extend output and exhibit an amend bug
Patrick Mezard <patrick@mezard.eu>
parents: 269
diff changeset
   363
  
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 420
diff changeset
   364
  $ hg debugobsolete
3015
4b951a9a6895 tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3013
diff changeset
   365
  73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
4b951a9a6895 tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3013
diff changeset
   366
  568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
492
7ecd41520dae rename `stabilize` to `evolve`
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 491
diff changeset
   367
  $ hg evolve
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   368
  move:[3] another feature (child of 568a468b60fc)
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   369
  atop:[4] a nifty feature
87
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 82
diff changeset
   370
  merging main-file-1
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 82
diff changeset
   371
  $ hg log
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   372
  5	feature-B: another feature (child of ba0ec09b1bab) - test
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   373
  4	feature-A: a nifty feature - test
87
246b8fefd0a5 [evolution/obsolete] very experimental and crude evolve support.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 82
diff changeset
   374
  0	: base - test
116
64ca29eef349 Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 113
diff changeset
   375
64ca29eef349 Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 113
diff changeset
   376
Test commit -o options
64ca29eef349 Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 113
diff changeset
   377
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   378
  $ hg up -r "desc('a nifty feature')"
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
   379
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   380
  $ hg revert -r "desc('another feature')" --all
4196
f21a9aac3add test-compat: backed out changeset 7091f7215651
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4195
diff changeset
   381
  reverting main-file-1
4166
7091f7215651 test: backed out output changes from changeset 6f391c2a773b
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4165
diff changeset
   382
  adding file-from-B
116
64ca29eef349 Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 113
diff changeset
   383
  $ sed -i'' -e s/Zwei/deux/ main-file-1
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   384
  $ hg commit -m 'another feature that rox' -o 5
137
bbc653876876 fix evolve test
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 116
diff changeset
   385
  created new head
116
64ca29eef349 Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 113
diff changeset
   386
  $ hg log
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   387
  6	feature-B: another feature that rox - test
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   388
  4	feature-A: a nifty feature - test
116
64ca29eef349 Add a -o option to commit
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 113
diff changeset
   389
  0	: base - test
309
de21685d22d1 evolve: warn when latecomer changeset are created
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
   390
4471
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
   391
phase change turning obsolete changeset public issues a phase divergence warning
309
de21685d22d1 evolve: warn when latecomer changeset are created
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
   392
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   393
  $ hg phase --hidden --public 99833d22b0c6
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   394
  1 new phase-divergent changesets
309
de21685d22d1 evolve: warn when latecomer changeset are created
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 302
diff changeset
   395
4471
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
   396
all solving phase-divergent
468
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 446
diff changeset
   397
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   398
  $ glog
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   399
  @  6:47d52a103155@default(draft) another feature that rox
468
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 446
diff changeset
   400
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   401
  | o  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
468
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 446
diff changeset
   402
  |/
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   403
  o  4:ba0ec09b1bab@default(public) a nifty feature
468
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 446
diff changeset
   404
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   405
  o  0:e55e0562ee93@default(public) base
468
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 446
diff changeset
   406
  
3155
b237c1c6dc19 evolve: rename --phasedivergent flag to --phase-divergent
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3075
diff changeset
   407
  $ hg evolve --any --traceback --phase-divergent
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   408
  recreate:[6] another feature that rox
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   409
  atop:[5] another feature (child of ba0ec09b1bab)
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
   410
  committed as aca219761afb
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
   411
  working directory is now at aca219761afb
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   412
  $ glog
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
   413
  @  7:aca219761afb@default(draft) phase-divergent update to 99833d22b0c6:
468
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 446
diff changeset
   414
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   415
  o  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
469
abeb17a9e313 stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 468
diff changeset
   416
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   417
  o  4:ba0ec09b1bab@default(public) a nifty feature
468
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 446
diff changeset
   418
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   419
  o  0:e55e0562ee93@default(public) base
468
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 446
diff changeset
   420
  
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
   421
  $ hg diff --hidden -r aca219761afb -r 47d52a103155
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
   422
  $ hg diff -r aca219761afb^ -r aca219761afb
469
abeb17a9e313 stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 468
diff changeset
   423
  diff --git a/main-file-1 b/main-file-1
abeb17a9e313 stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 468
diff changeset
   424
  --- a/main-file-1
abeb17a9e313 stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 468
diff changeset
   425
  +++ b/main-file-1
abeb17a9e313 stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 468
diff changeset
   426
  @@ -3,1 +3,1 @@
abeb17a9e313 stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 468
diff changeset
   427
  -Zwei
abeb17a9e313 stabilize: handle latecomer
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 468
diff changeset
   428
  +deux
4471
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
   429
  $ hg log -r 'phasedivergent()' # no more phase-divergent
468
6b1b6d338478 stabilize: rework stabilize code to allow selection of latecomer and conflicting
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 446
diff changeset
   430
705
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   431
test evolve --all
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   432
  $ sed -i'' -e s/deux/to/ main-file-1
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   433
  $ hg commit -m 'dansk 2!'
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   434
  $ sed -i'' -e s/Three/tre/ main-file-1
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   435
  $ hg commit -m 'dansk 3!'
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
   436
  $ hg update aca219761afb
705
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   437
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   438
  $ sed -i'' -e s/Un/Én/ main-file-1
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   439
  $ hg commit --amend -m 'dansk!'
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   440
  2 new orphan changesets
705
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   441
1399
9ff6d9240f16 template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 945
diff changeset
   442
(ninja test for the {trouble} template:
9ff6d9240f16 template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 945
diff changeset
   443
4625
a4fde4e3e763 templatekw: add `instabilities` alias for `troubles`
Matt Harbison <matt_harbison@yahoo.com>
parents: 4613
diff changeset
   444
  $ hg log -G --template '{rev} {instabilities}\n'
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   445
  @  10
1399
9ff6d9240f16 template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 945
diff changeset
   446
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
   447
  | *  9 orphan
1399
9ff6d9240f16 template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 945
diff changeset
   448
  | |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
   449
  | *  8 orphan
1399
9ff6d9240f16 template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 945
diff changeset
   450
  | |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   451
  | x  7
1399
9ff6d9240f16 template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 945
diff changeset
   452
  |/
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   453
  o  5
1399
9ff6d9240f16 template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 945
diff changeset
   454
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   455
  o  4
1399
9ff6d9240f16 template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 945
diff changeset
   456
  |
9ff6d9240f16 template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 945
diff changeset
   457
  o  0
9ff6d9240f16 template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 945
diff changeset
   458
  
9ff6d9240f16 template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 945
diff changeset
   459
9ff6d9240f16 template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 945
diff changeset
   460
9ff6d9240f16 template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 945
diff changeset
   461
(/ninja)
9ff6d9240f16 template: add a troubles keyword
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 945
diff changeset
   462
705
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   463
  $ hg evolve --all --traceback
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   464
  move:[8] dansk 2!
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   465
  atop:[10] dansk!
705
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   466
  merging main-file-1
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   467
  move:[9] dansk 3!
705
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   468
  merging main-file-1
2776
4dd84054ebbb test: remove reference to the graphlog extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2767
diff changeset
   469
  $ hg log -G
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
   470
  o  12	: dansk 3! - test
705
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   471
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   472
  o  11	: dansk 2! - test
705
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   473
  |
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
   474
  @  10	feature-B: dansk! - test
705
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   475
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   476
  o  5	: another feature (child of ba0ec09b1bab) - test
705
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   477
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   478
  o  4	feature-A: a nifty feature - test
705
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   479
  |
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   480
  o  0	: base - test
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   481
  
4884111bcb92 evolve: add test for evolve --all.
Levi Bard <levi@unity3d.com>
parents: 652
diff changeset
   482
196
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   483
  $ cd ..
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   484
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   485
enable general delta
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   486
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   487
  $ cat << EOF >> $HGRCPATH
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   488
  > [format]
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   489
  > generaldelta=1
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   490
  > EOF
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   491
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   492
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   493
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   494
  $ hg init alpha
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   495
  $ cd alpha
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   496
  $ echo 'base' > firstfile
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   497
  $ hg add firstfile
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   498
  $ hg ci -m 'base'
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   499
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   500
  $ cd ..
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   501
  $ hg clone -Ur 0 alpha beta
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   502
  adding changesets
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   503
  adding manifests
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   504
  adding file changes
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   505
  added 1 changesets with 1 changes to 1 files
4197
1dd5c6e6cd53 test-compat: backed out changeset ccbfbeee6cf3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4196
diff changeset
   506
  new changesets 702e4d0a6d86 (1 drafts)
196
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   507
  $ cd alpha
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   508
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   509
  $ cat << EOF > A
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   510
  > We
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   511
  > need
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   512
  > some
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   513
  > kind
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   514
  > of 
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   515
  > file
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   516
  > big
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   517
  > enough
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   518
  > to
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   519
  > prevent
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   520
  > snapshot
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   521
  > .
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   522
  > yes
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   523
  > new
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   524
  > lines
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   525
  > are
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   526
  > useless
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   527
  > .
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   528
  > EOF
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   529
  $ hg add A
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   530
  $ hg commit -m 'adding A'
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   531
  $ hg mv A B
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   532
  $ echo '.' >> B
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   533
  $ hg amend -m 'add B'
219
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 196
diff changeset
   534
  $ hg verify
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 196
diff changeset
   535
  checking changesets
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 196
diff changeset
   536
  checking manifests
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 196
diff changeset
   537
  crosschecking files in changesets and manifests
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 196
diff changeset
   538
  checking files
4198
d2b532b2790b test-compat: backed out changeset e2d083cc447e
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4197
diff changeset
   539
  checked 3 changesets with 3 changes to 3 files
219
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 196
diff changeset
   540
  $ hg --config extensions.hgext.mq= strip 'extinct()'
625
e291e5271694 prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 620
diff changeset
   541
  abort: empty revision set
e291e5271694 prepare for Full scale filtering !!!
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 620
diff changeset
   542
  [255]
2564
cda34aeb01d7 test-evolve: garbage collection changeset only, not obsmarkers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2547
diff changeset
   543
(do some garbare collection)
cda34aeb01d7 test-evolve: garbage collection changeset only, not obsmarkers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2547
diff changeset
   544
  $ hg --config extensions.hgext.mq= strip --hidden 'extinct()'  --config devel.strip-obsmarkers=no
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   545
  saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-a365b072-backup.hg (glob)
219
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 196
diff changeset
   546
  $ hg verify
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 196
diff changeset
   547
  checking changesets
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 196
diff changeset
   548
  checking manifests
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 196
diff changeset
   549
  crosschecking files in changesets and manifests
cfdab01ca8a0 evolve-amend: properly handle amending file renames and additions.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 196
diff changeset
   550
  checking files
4198
d2b532b2790b test-compat: backed out changeset e2d083cc447e
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4197
diff changeset
   551
  checked 2 changesets with 2 changes to 2 files
196
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   552
  $ cd ..
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   553
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   554
Clone just this branch
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   555
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   556
  $ cd beta
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   557
  $ hg pull -r tip ../alpha
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   558
  pulling from ../alpha
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   559
  searching for changes
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   560
  adding changesets
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   561
  adding manifests
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   562
  adding file changes
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   563
  added 1 changesets with 1 changes to 1 files
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   564
  1 new obsolescence markers
4197
1dd5c6e6cd53 test-compat: backed out changeset ccbfbeee6cf3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4196
diff changeset
   565
  new changesets c6dda801837c (1 drafts)
196
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   566
  (run 'hg update' to get a working copy)
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   567
  $ hg up
dea67dae27a4 amend: add a warning after amend added unstablility
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 145
diff changeset
   568
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   569
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   570
  $ cd ..
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   571
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   572
Normal testing
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   573
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   574
  $ hg init test-graft
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   575
  $ cd test-graft
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   576
  $ mkcommit 0
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   577
  $ mkcommit 1
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   578
  $ mkcommit 2
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   579
  $ mkcommit 3
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   580
  $ hg up -qC 0
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   581
  $ mkcommit 4
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   582
  created new head
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   583
  $ glog --hidden
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   584
  @  4:ce341209337f@default(draft) add 4
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   585
  |
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   586
  | o  3:0e84df4912da@default(draft) add 3
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   587
  | |
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   588
  | o  2:db038628b9e5@default(draft) add 2
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   589
  | |
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   590
  | o  1:73d38bb17fd7@default(draft) add 1
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   591
  |/
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   592
  o  0:8685c6d34325@default(draft) add 0
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   593
  
4053
ecbf61d90807 pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4052
diff changeset
   594
  $ hg pick -r3
4049
25981fae92f9 pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3983
diff changeset
   595
  picking 3:0e84df4912da "add 3"
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   596
  $ hg graft -r1
1188
0c879e986ce4 test: adapt to core change in graft and rebase
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1185
diff changeset
   597
  grafting 1:73d38bb17fd7 "add 1"
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   598
  $ hg prune -r2 --succ .
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   599
  1 changesets pruned
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   600
  $ glog --hidden
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   601
  @  6:417185465d2c@default(draft) add 1
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   602
  |
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   603
  o  5:fa455b5098e0@default(draft) add 3
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   604
  |
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   605
  o  4:ce341209337f@default(draft) add 4
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   606
  |
419
03672e955bc8 evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu>
parents: 385
diff changeset
   607
  | x  3:0e84df4912da@default(draft) add 3
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   608
  | |
419
03672e955bc8 evolve: make graft wrapper handle --rev
Patrick Mezard <patrick@mezard.eu>
parents: 385
diff changeset
   609
  | x  2:db038628b9e5@default(draft) add 2
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   610
  | |
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   611
  | o  1:73d38bb17fd7@default(draft) add 1
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   612
  |/
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   613
  o  0:8685c6d34325@default(draft) add 0
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   614
  
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 420
diff changeset
   615
  $ hg debugobsolete
4051
ddae36b4031e pick: use "pick" as operation name in obsolescence markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4049
diff changeset
   616
  0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'pick', 'user': 'test'}
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   617
  db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   618
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   619
Test grab --continue
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   620
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   621
  $ hg up -qC 0
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   622
  $ echo 2 > 1
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   623
  $ hg ci -Am conflict 1
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   624
  created new head
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   625
  $ hg up -qC 6
4053
ecbf61d90807 pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4052
diff changeset
   626
  $ hg pick -r 7
4049
25981fae92f9 pick: update command output to mention pick instead of grab
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3983
diff changeset
   627
  picking 7:a5bfd90a2f29 "conflict"
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   628
  merging 1
1516
c4f8a2916e43 tests: run test with 3.6 and apply test change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1510
diff changeset
   629
  warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   630
  unresolved merge conflicts (see hg help resolve)
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   631
  [1]
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   632
  $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
1732
f4047fba5e90 templates: change {obsolete} to emit only "obsolete" or ""
Martin von Zweigbergk <martinvonz@google.com>
parents: 1731
diff changeset
   633
  7:a5bfd90a2f29 
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   634
  $ echo 3 > 1
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   635
  $ hg resolve -m 1
1026
35adaf02b777 test: apply message changes introduced by mercurial 3.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 950
diff changeset
   636
  (no more unresolved files)
4052
73e73471d6c6 pick: replace "grabstate" with "pickstate"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4051
diff changeset
   637
  continue: hg pick --continue
4053
ecbf61d90807 pick: replace `hg grab` invocation in test with `hg pick`
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4052
diff changeset
   638
  $ hg pick --continue
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   639
  $ glog --hidden
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   640
  @  8:fb2c0f0a0c54@default(draft) conflict
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   641
  |
420
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 419 418
diff changeset
   642
  | x  7:a5bfd90a2f29@default(draft) conflict
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   643
  | |
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   644
  o |  6:417185465d2c@default(draft) add 1
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   645
  | |
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   646
  o |  5:fa455b5098e0@default(draft) add 3
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   647
  | |
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   648
  o |  4:ce341209337f@default(draft) add 4
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   649
  |/
420
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 419 418
diff changeset
   650
  | x  3:0e84df4912da@default(draft) add 3
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   651
  | |
420
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 419 418
diff changeset
   652
  | x  2:db038628b9e5@default(draft) add 2
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   653
  | |
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   654
  | o  1:73d38bb17fd7@default(draft) add 1
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   655
  |/
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   656
  o  0:8685c6d34325@default(draft) add 0
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   657
  
441
d702f0d26c6a obsolete: remove debugsuccessors
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 420
diff changeset
   658
  $ hg debugobsolete
4051
ddae36b4031e pick: use "pick" as operation name in obsolescence markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4049
diff changeset
   659
  0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'pick', 'user': 'test'}
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   660
  db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
4051
ddae36b4031e pick: use "pick" as operation name in obsolescence markers
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4049
diff changeset
   661
  a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 fb2c0f0a0c54be4367988521bad2cbd33a540969 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'pick', 'user': 'test'}
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   662
481
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   663
Test touch
418
18a0d96ed559 evolve: graft --continue is optional, test
Patrick Mezard <patrick@mezard.eu>
parents: 414
diff changeset
   664
481
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   665
  $ glog
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   666
  @  8:fb2c0f0a0c54@default(draft) conflict
481
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   667
  |
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   668
  o  6:417185465d2c@default(draft) add 1
481
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   669
  |
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   670
  o  5:fa455b5098e0@default(draft) add 3
481
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   671
  |
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   672
  o  4:ce341209337f@default(draft) add 4
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   673
  |
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   674
  | o  1:73d38bb17fd7@default(draft) add 1
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   675
  |/
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   676
  o  0:8685c6d34325@default(draft) add 0
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   677
  
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   678
  $ hg touch
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   679
  $ glog
482
d2531a747ff5 evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 481
diff changeset
   680
  @  9:*@default(draft) conflict (glob)
481
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   681
  |
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   682
  o  6:417185465d2c@default(draft) add 1
481
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   683
  |
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   684
  o  5:fa455b5098e0@default(draft) add 3
481
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   685
  |
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   686
  o  4:ce341209337f@default(draft) add 4
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   687
  |
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   688
  | o  1:73d38bb17fd7@default(draft) add 1
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   689
  |/
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   690
  o  0:8685c6d34325@default(draft) add 0
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   691
  
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   692
  $ hg touch .
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   693
  $ glog
482
d2531a747ff5 evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 481
diff changeset
   694
  @  10:*@default(draft) conflict (glob)
481
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   695
  |
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   696
  o  6:417185465d2c@default(draft) add 1
481
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   697
  |
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   698
  o  5:fa455b5098e0@default(draft) add 3
481
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   699
  |
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   700
  o  4:ce341209337f@default(draft) add 4
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   701
  |
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   702
  | o  1:73d38bb17fd7@default(draft) add 1
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   703
  |/
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   704
  o  0:8685c6d34325@default(draft) add 0
4e0f1aae8d24 evolve: touch command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 477
diff changeset
   705
  
482
d2531a747ff5 evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 481
diff changeset
   706
d2531a747ff5 evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 481
diff changeset
   707
Test fold
2767
ab80ef8d0cfa test: extract most fold testing into a test-fold module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2587
diff changeset
   708
(most of the testing have been moved to test-fold
482
d2531a747ff5 evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 481
diff changeset
   709
549
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   710
  $ rm *.orig
997
f48cd2f48d14 fold: reword error message for public commits
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 996
diff changeset
   711
  $ hg phase --public 0
1782
a046e78c3290 fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents: 1779
diff changeset
   712
  $ hg fold --from -r 5
996
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 995
diff changeset
   713
  3 changesets folded
549
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   714
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
996
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 995
diff changeset
   715
  $ hg log -r 11 --template '{desc}\n'
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 995
diff changeset
   716
  add 3
482
d2531a747ff5 evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 481
diff changeset
   717
  
996
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 995
diff changeset
   718
  
482
d2531a747ff5 evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 481
diff changeset
   719
  add 1
d2531a747ff5 evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 481
diff changeset
   720
  
d2531a747ff5 evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 481
diff changeset
   721
  
d2531a747ff5 evolve: fold command
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 481
diff changeset
   722
  conflict
549
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   723
  $ hg debugrebuildstate
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   724
  $ hg st
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   725
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   726
Test fold with wc parent is not the head of the folded revision
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   727
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   728
  $ hg up 4
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   729
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
996
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 995
diff changeset
   730
  $ hg fold --rev 4::11 --user victor --exact
b98dd5d3065c fold: overhaul handling of revisions with --rev (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 995
diff changeset
   731
  2 changesets folded
549
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   732
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   733
  $ glog
915
1ebe5c51919b fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 901
diff changeset
   734
  @  12:d26d339c513f@default(draft) add 4
549
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   735
  |
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   736
  | o  1:73d38bb17fd7@default(draft) add 1
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   737
  |/
997
f48cd2f48d14 fold: reword error message for public commits
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 996
diff changeset
   738
  o  0:8685c6d34325@default(public) add 0
549
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   739
  
915
1ebe5c51919b fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 901
diff changeset
   740
  $ hg log --template '{rev}: {author}\n'
1ebe5c51919b fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 901
diff changeset
   741
  12: victor
1ebe5c51919b fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 901
diff changeset
   742
  1: test
1ebe5c51919b fold: enable --date and --user options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 901
diff changeset
   743
  0: test
549
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   744
  $ hg log -r 12 --template '{desc}\n'
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   745
  add 4
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   746
  
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   747
  
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   748
  add 3
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   749
  
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   750
  
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   751
  add 1
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   752
  
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   753
  
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   754
  conflict
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   755
  $ hg debugrebuildstate
b047e9417d96 Properly update after fold
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 492
diff changeset
   756
  $ hg st
483
b12ff7ef35b1 Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 482
diff changeset
   757
b12ff7ef35b1 Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 482
diff changeset
   758
Test olog
b12ff7ef35b1 Introduction of olog as an alias
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 482
diff changeset
   759
2426
0751c8f6005d test: reduce output size to fight unstability
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2416
diff changeset
   760
  $ hg olog | head -n 10 # hg touch makes the output unstable (fix it with devel option for more stable touch)
2416
23c0bef0b5d4 obshistory: rename the command to "olog"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2290
diff changeset
   761
  @    d26d339c513f (12) add 4
23c0bef0b5d4 obshistory: rename the command to "olog"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2290
diff changeset
   762
  |\
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   763
  x |  ce341209337f (4) add 4
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   764
   /     rewritten(description, user, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   765
  |
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   766
  x    cf0c3904643c (11) add 3
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   767
  |\     rewritten(description, user, parent, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   768
  | |
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   769
  | \
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   770
  | |\
901
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   771
807
4dd1cda16fd0 evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 742
diff changeset
   772
Test obsstore stat
4dd1cda16fd0 evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 742
diff changeset
   773
4dd1cda16fd0 evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 742
diff changeset
   774
  $ hg debugobsstorestat
4dd1cda16fd0 evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 742
diff changeset
   775
  markers total:                     10
2547
3c594000844b debugobsstorestat: adds static about actually obsolete changeses
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2501
diff changeset
   776
      for known precursors:          10 (10/13 obsolete changesets)
809
5d3ddede6ccf debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 807
diff changeset
   777
      with parents data:              0
807
4dd1cda16fd0 evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 742
diff changeset
   778
  markers with no successors:         0
4dd1cda16fd0 evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 742
diff changeset
   779
                1 successors:        10
4dd1cda16fd0 evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 742
diff changeset
   780
                2 successors:         0
4dd1cda16fd0 evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 742
diff changeset
   781
      more than 2 successors:         0
4dd1cda16fd0 evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 742
diff changeset
   782
      available  keys:
2572
aa2ce20e6247 effectflag: activate effect flag on test-evolve.t test file
Boris Feld <boris.feld@octobus.net>
parents: 2564
diff changeset
   783
                  ef1:               10
3568
eca57332ad03 touch: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3564
diff changeset
   784
            operation:               10
807
4dd1cda16fd0 evolve: add a debugobsstorestat command
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 742
diff changeset
   785
                 user:               10
2440
0fa7971071b1 debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2426
diff changeset
   786
  marker size:
0fa7971071b1 debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2426
diff changeset
   787
      format v1:
3568
eca57332ad03 touch: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3564
diff changeset
   788
          smallest length:           90
3561
4701e8888c4f amend: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3559
diff changeset
   789
          longer length:             92
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3561
diff changeset
   790
          median length:             91
3599
5a796d753427 evolve: kill `--obsolete` and `--old-obsolete` flags for graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3568
diff changeset
   791
          mean length:               90
2440
0fa7971071b1 debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2426
diff changeset
   792
      format v0:
0fa7971071b1 debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2426
diff changeset
   793
          smallest length:           * (glob)
0fa7971071b1 debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2426
diff changeset
   794
          longer length:             * (glob)
0fa7971071b1 debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2426
diff changeset
   795
          median length:             * (glob)
0fa7971071b1 debugobsstorestat: add markers size information
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2426
diff changeset
   796
          mean length:               * (glob)
809
5d3ddede6ccf debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 807
diff changeset
   797
  disconnected clusters:              1
5d3ddede6ccf debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 807
diff changeset
   798
          any known node:             1
5d3ddede6ccf debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 807
diff changeset
   799
          smallest length:           10
5d3ddede6ccf debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 807
diff changeset
   800
          longer length:             10
5d3ddede6ccf debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 807
diff changeset
   801
          median length:             10
5d3ddede6ccf debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 807
diff changeset
   802
          mean length:               10
5d3ddede6ccf debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 807
diff changeset
   803
      using parents data:             1
5d3ddede6ccf debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 807
diff changeset
   804
          any known node:             1
5d3ddede6ccf debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 807
diff changeset
   805
          smallest length:           10
5d3ddede6ccf debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 807
diff changeset
   806
          longer length:             10
5d3ddede6ccf debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 807
diff changeset
   807
          median length:             10
5d3ddede6ccf debugobsstorestat: add information about cluster
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 807
diff changeset
   808
          mean length:               10
907
c17ab719da56 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 865 901
diff changeset
   809
901
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   810
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   811
Test evolving renames
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   812
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   813
  $ hg up null
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   814
  0 files updated, 0 files merged, 4 files removed, 0 files unresolved
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   815
  $ echo a > a
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   816
  $ hg ci -Am a
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   817
  adding a
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   818
  created new head
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   819
  $ echo b > b
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   820
  $ hg ci -Am b
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   821
  adding b
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   822
  $ hg mv a c
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   823
  $ hg ci -m c
1631
7463f5880ce9 prune: remove the kill alias
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1594
diff changeset
   824
  $ hg prune .^
901
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   825
  1 changesets pruned
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   826
  1 new orphan changesets
901
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   827
  $ hg stab --any
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   828
  move:[15] c
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   829
  atop:[13] a
1099
bac4e0bc9f6a evolve: write a status message when the working directory changes
David Soria Parra <davidsp@fb.com>
parents: 1067
diff changeset
   830
  working directory is now at 3742bde73477
901
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   831
  $ hg st -C --change=tip
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   832
  A c
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   833
    a
4f84b3307dc2 Fix preservation of rename information on evolve (#33)
Julien Cristau <julien.cristau@logilab.fr>
parents: 742
diff changeset
   834
  R a
933
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   835
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   836
Test fold with commit messages
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   837
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   838
  $ cd ../work
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
   839
  $ hg up
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
   840
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1782
a046e78c3290 fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents: 1779
diff changeset
   841
  $ hg fold --from .^ --message "Folding with custom commit message"
933
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   842
  2 changesets folded
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   843
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   844
  $ glog
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
   845
  @  13:284c0d45770d@default(draft) Folding with custom commit message
933
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   846
  |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
   847
  o  10:9975c016fe7b@default(draft) dansk!
933
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   848
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   849
  o  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
933
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   850
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   851
  o  4:ba0ec09b1bab@default(public) a nifty feature
933
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   852
  |
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   853
  o  0:e55e0562ee93@default(public) base
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   854
  
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   855
  $ cat > commit-message <<EOF
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   856
  > A longer
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   857
  >                   commit message
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   858
  > EOF
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   859
1782
a046e78c3290 fold: require --from flag for folding revisions to working copy
Martin von Zweigbergk <martinvonz@google.com>
parents: 1779
diff changeset
   860
  $ hg fold --from .^ --logfile commit-message
933
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   861
  2 changesets folded
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   862
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   863
  $ hg qlog
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
   864
  14 - 8693d0f277b8 A longer
933
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   865
                    commit message (draft)
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   866
  5 - 99833d22b0c6 another feature (child of ba0ec09b1bab) (public)
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   867
  4 - ba0ec09b1bab a nifty feature (public)
933
e5baeb8fefec fold: add --message and --logfile options
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 915
diff changeset
   868
  0 - e55e0562ee93 base (public)
1141
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   869
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   870
  $ cd ..
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   871
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   872
Test branch preservation:
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   873
===========================
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   874
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   875
  $ hg init evolving-branch
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   876
  $ cd evolving-branch
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   877
  $ touch a
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   878
  $ hg add a
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   879
  $ hg ci -m 'a0'
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   880
  $ echo 1 > a
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   881
  $ hg ci -m 'a1'
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   882
  $ echo 2 > a
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   883
  $ hg ci -m 'a2'
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   884
  $ echo 3 > a
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   885
  $ hg ci -m 'a3'
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   886
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   887
  $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   888
  @  3 [default] a3
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   889
  |
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   890
  o  2 [default] a2
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   891
  |
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   892
  o  1 [default] a1
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   893
  |
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   894
  o  0 [default] a0
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   895
  
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   896
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   897
branch change propagated
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   898
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   899
  $ hg up 'desc(a2)'
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   900
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   901
  $ hg branch mybranch
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   902
  marked working directory as branch mybranch
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   903
  (branches are permanent and global, did you want a bookmark?)
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   904
  $ hg amend
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   905
  1 new orphan changesets
1141
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   906
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   907
  $ hg evolve
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   908
  move:[3] a3
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   909
  atop:[4] a2
1141
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   910
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   911
  $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
   912
  o  5 [mybranch] a3
1141
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   913
  |
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
   914
  @  4 [mybranch] a2
1141
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   915
  |
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   916
  o  1 [default] a1
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   917
  |
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   918
  o  0 [default] a0
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   919
  
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   920
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   921
branch change preserved
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   922
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   923
  $ hg up 'desc(a1)'
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   924
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   925
  $ hg amend -m 'a1_'
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   926
  2 new orphan changesets
4579
e6d7d261ca4a tests: add --rev to hg evolve to reduce test changes for the next patch
Anton Shestakov <av6@dwimlabs.net>
parents: 4577
diff changeset
   927
  $ hg evolve --rev 'first(orphan())'
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   928
  move:[4] a2
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   929
  atop:[6] a1_
1141
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   930
  $ hg evolve
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   931
  move:[5] a3
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   932
  atop:[7] a2
1141
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   933
  $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
   934
  o  8 [mybranch] a3
1141
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   935
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   936
  o  7 [mybranch] a2
1141
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   937
  |
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
   938
  @  6 [default] a1_
1141
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   939
  |
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   940
  o  0 [default] a0
ca17770d2ee9 evolve: preserve branch change
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1133
diff changeset
   941
  
1157
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1141
diff changeset
   942
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1141
diff changeset
   943
Evolve from the middle of a stack pick the right changesets.
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1141
diff changeset
   944
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1141
diff changeset
   945
  $ hg ci --amend -m 'a1__'
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   946
  2 new orphan changesets
1157
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1141
diff changeset
   947
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   948
  $ hg up -r "desc('a2')"
1157
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1141
diff changeset
   949
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1422
c868a69c29c5 evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1414
diff changeset
   950
  $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   951
  o  9 [default] a1__
1422
c868a69c29c5 evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1414
diff changeset
   952
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
   953
  | *  8 [mybranch] a3
1422
c868a69c29c5 evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1414
diff changeset
   954
  | |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   955
  | @  7 [mybranch] a2
1422
c868a69c29c5 evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1414
diff changeset
   956
  | |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   957
  | x  6 [default] a1_
1422
c868a69c29c5 evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1414
diff changeset
   958
  |/
c868a69c29c5 evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1414
diff changeset
   959
  o  0 [default] a0
c868a69c29c5 evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1414
diff changeset
   960
  
1157
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1141
diff changeset
   961
  $ hg evolve
1410
2c451fece7a6 evolve: unify revision handling and rework error message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1406
diff changeset
   962
  nothing to evolve on current working copy parent
2834
38db1466c6fb log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents: 2832
diff changeset
   963
  (2 other orphan in the repository, do you want --any or --rev)
1157
5951969400ce evolve: fix selection of changeset to evolve from the middle of a stack (issue4434)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1141
diff changeset
   964
  [2]
1194
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents: 1185
diff changeset
   965
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents: 1185
diff changeset
   966
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents: 1185
diff changeset
   967
Evolve disables active bookmarks.
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents: 1185
diff changeset
   968
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   969
  $ hg up -r "desc('a1__')"
1194
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents: 1185
diff changeset
   970
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents: 1185
diff changeset
   971
  $ hg bookmark testbookmark
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents: 1185
diff changeset
   972
  $ ls .hg/bookmarks*
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents: 1185
diff changeset
   973
  .hg/bookmarks
1330
efb75f4d55aa bookmarks: update to use new bookmarks api via compatibility layer
Ryan McElroy <rmcelroy@fb.com>
parents: 1279
diff changeset
   974
  .hg/bookmarks.* (glob)
4579
e6d7d261ca4a tests: add --rev to hg evolve to reduce test changes for the next patch
Anton Shestakov <av6@dwimlabs.net>
parents: 4577
diff changeset
   975
  $ hg evolve --rev 'first(orphan())'
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   976
  move:[7] a2
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   977
  atop:[9] a1__
1194
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents: 1185
diff changeset
   978
  (leaving bookmark testbookmark)
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents: 1185
diff changeset
   979
  $ ls .hg/bookmarks*
aa7cdd9d7310 evolve: explicitly disable bookmark on evolve (issue4432)
Tyrone Nicholas <tnicholas@fb.com>
parents: 1185
diff changeset
   980
  .hg/bookmarks
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   981
  $ glog
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
   982
  o  10:d952e93add6f@mybranch(draft) a2
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
   983
  |
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
   984
  @  9:9f8b83c2e7f3@default(draft) a1__
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
   985
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
   986
  | *  8:777c26ca5e78@mybranch(draft) a3
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
   987
  | |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   988
  | x  7:eb07e22a0e63@mybranch(draft) a2
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
   989
  | |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   990
  | x  6:faafc6cea0ba@default(draft) a1_
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
   991
  |/
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   992
  o  0:07c1c36d9ef0@default(draft) a0
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
   993
  
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
   994
4471
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
   995
Possibility to select what instability to solve first, asking for
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
   996
phase-divergent before content-divergent
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   997
  $ hg revert -r d952e93add6f --all
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
   998
  reverting a
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
   999
  $ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1000
  o  10 [mybranch] a2
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1001
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1002
  @  9 [default] a1__
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1003
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1004
  | *  8 [mybranch] a3
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1005
  | |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1006
  | x  7 [mybranch] a2
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1007
  | |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1008
  | x  6 [default] a1_
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1009
  |/
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1010
  o  0 [default] a0
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1011
  
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1012
  $ echo "hello world" > newfile
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1013
  $ hg add newfile
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1014
  $ hg commit -m "add new file bumped" -o 10
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1015
  $ hg phase --public --hidden d952e93add6f
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1016
  1 new phase-divergent changesets
2776
4dd84054ebbb test: remove reference to the graphlog extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2767
diff changeset
  1017
  $ hg log -G
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1018
  @  11	: add new file bumped - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1019
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1020
  | o  10	: a2 - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1021
  |/
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1022
  o  9	testbookmark: a1__ - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1023
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1024
  | *  8	: a3 - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1025
  | |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1026
  | x  7	: a2 - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1027
  | |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1028
  | x  6	: a1_ - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1029
  |/
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1030
  o  0	: a0 - test
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1031
  
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1032
4471
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
  1033
Now we have a phase-divergent and an orphan changeset, we solve the
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
  1034
phase-divergent first. Normally the orphan changeset would be solved first
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1035
2776
4dd84054ebbb test: remove reference to the graphlog extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2767
diff changeset
  1036
  $ hg log -G
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1037
  @  11	: add new file bumped - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1038
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1039
  | o  10	: a2 - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1040
  |/
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1041
  o  9	testbookmark: a1__ - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1042
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1043
  | *  8	: a3 - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1044
  | |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1045
  | x  7	: a2 - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1046
  | |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1047
  | x  6	: a1_ - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1048
  |/
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1049
  o  0	: a0 - test
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1050
  
3155
b237c1c6dc19 evolve: rename --phasedivergent flag to --phase-divergent
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3075
diff changeset
  1051
  $ hg evolve -r "desc('add new file bumped')" --phase-divergent
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1052
  recreate:[11] add new file bumped
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1053
  atop:[10] a2
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1054
  committed as a8bb31d4b7f2
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1055
  working directory is now at a8bb31d4b7f2
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1056
  $ hg evolve --any
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1057
  move:[8] a3
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1058
  atop:[12] phase-divergent update to d952e93add6f:
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1059
  $ glog
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
  1060
  o  13:b88539ad24d7@default(draft) a3
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1061
  |
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
  1062
  @  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1063
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1064
  o  10:d952e93add6f@mybranch(public) a2
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1065
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1066
  o  9:9f8b83c2e7f3@default(public) a1__
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1067
  |
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1068
  o  0:07c1c36d9ef0@default(public) a0
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1069
  
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1070
4471
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
  1071
Check that we can resolve instabilities in a revset with more than one commit
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1072
  $ hg up b88539ad24d7 -C
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
  1073
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1074
  $ mkcommit gg
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1075
  $ hg up b88539ad24d7
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1076
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1077
  $ mkcommit gh
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1078
  created new head
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1079
  $ hg up b88539ad24d7
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1080
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1406
5a91ee6a42e6 test-evolve: fix tests failing on some platform
Laurent Charignon <lcharignon@fb.com>
parents: 1405
diff changeset
  1081
  $ printf "newline\nnewline\n" >> a
2776
4dd84054ebbb test: remove reference to the graphlog extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2767
diff changeset
  1082
  $ hg log -G
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1083
  o  15	: add gh - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1084
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1085
  | o  14	: add gg - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1086
  |/
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1087
  @  13	: a3 - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1088
  |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1089
  o  12	: phase-divergent update to d952e93add6f: - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1090
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1091
  o  10	: a2 - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1092
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1093
  o  9	testbookmark: a1__ - test
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1094
  |
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1095
  o  0	: a0 - test
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1096
  
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1097
  $ hg amend
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1098
  2 new orphan changesets
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1099
  $ glog
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1100
  @  16:0cf3707e8971@default(draft) a3
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1101
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1102
  | *  15:daa1ff1c7fbd@default(draft) add gh
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1103
  | |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1104
  | | *  14:484fb3cfa7f2@default(draft) add gg
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1105
  | |/
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1106
  | x  13:b88539ad24d7@default(draft) a3
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1107
  |/
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1108
  o  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1109
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1110
  o  10:d952e93add6f@mybranch(public) a2
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1111
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1112
  o  9:9f8b83c2e7f3@default(public) a1__
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1113
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1114
  o  0:07c1c36d9ef0@default(public) a0
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1115
  
1349
70681abf79d1 evolve: move return statement at the right level
Laurent Charignon <lcharignon@fb.com>
parents: 1336
diff changeset
  1116
70681abf79d1 evolve: move return statement at the right level
Laurent Charignon <lcharignon@fb.com>
parents: 1336
diff changeset
  1117
Evolving an empty revset should do nothing
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1118
  $ hg evolve --rev "daa1ff1c7fbd and 484fb3cfa7f2"
1410
2c451fece7a6 evolve: unify revision handling and rework error message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1406
diff changeset
  1119
  set of specified revisions is empty
2c451fece7a6 evolve: unify revision handling and rework error message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1406
diff changeset
  1120
  [1]
1349
70681abf79d1 evolve: move return statement at the right level
Laurent Charignon <lcharignon@fb.com>
parents: 1336
diff changeset
  1121
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1122
  $ hg evolve --rev "b88539ad24d7::" --phase-divergent
2836
feaa52680682 log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net>
parents: 2834
diff changeset
  1123
  no phasedivergent changesets in specified revisions
2834
38db1466c6fb log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents: 2832
diff changeset
  1124
  (do you want to use --orphan)
1410
2c451fece7a6 evolve: unify revision handling and rework error message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1406
diff changeset
  1125
  [2]
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1126
  $ hg evolve --rev "b88539ad24d7::" --orphan
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1127
  move:[14] add gg
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1128
  atop:[16] a3
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1129
  move:[15] add gh
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1130
  atop:[16] a3
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1131
  $ glog
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
  1132
  o  18:0c049e4e5422@default(draft) add gh
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1133
  |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1134
  | o  17:98e171e2f272@default(draft) add gg
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1135
  |/
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
  1136
  @  16:0cf3707e8971@default(draft) a3
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1137
  |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1138
  o  12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1139
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1140
  o  10:d952e93add6f@mybranch(public) a2
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1141
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1142
  o  9:9f8b83c2e7f3@default(public) a1__
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1143
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1144
  o  0:07c1c36d9ef0@default(public) a0
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1145
  
1441
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1146
Enabling commands selectively, no command enabled, next and fold and unknown
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1147
  $ cat >> $HGRCPATH <<EOF
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1148
  > [experimental]
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1149
  > evolution=createmarkers
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1150
  > EOF
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1151
  $ hg next
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1152
  hg: unknown command 'next'
4195
4803bfe8db17 test-compat: backed out changeset 8eec9422bd8e
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4168
diff changeset
  1153
  (use 'hg help' for a list of commands)
1441
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1154
  [255]
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1155
  $ hg fold
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1156
  hg: unknown command 'fold'
4195
4803bfe8db17 test-compat: backed out changeset 8eec9422bd8e
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4168
diff changeset
  1157
  (use 'hg help' for a list of commands)
1441
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1158
  [255]
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1159
Enabling commands selectively, only fold enabled, next is still unknown
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1160
  $ cat >> $HGRCPATH <<EOF
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1161
  > [experimental]
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1162
  > evolution=createmarkers
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1163
  > evolutioncommands=fold
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1164
  > EOF
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1165
  $ hg fold
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1166
  abort: no revisions specified
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1167
  [255]
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1168
  $ hg next
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1169
  hg: unknown command 'next'
4195
4803bfe8db17 test-compat: backed out changeset 8eec9422bd8e
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4168
diff changeset
  1170
  (use 'hg help' for a list of commands)
1441
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1171
  [255]
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1172
3455
f7ecb11d71bb update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1173
Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
f7ecb11d71bb update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1174
f7ecb11d71bb update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1175
  $ hg --hidden up 14
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
  1176
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
3747
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3702
diff changeset
  1177
  updated to hidden changeset 484fb3cfa7f2
3455
f7ecb11d71bb update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1178
  (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272)
f7ecb11d71bb update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1179
  working directory parent is obsolete! (484fb3cfa7f2)
f7ecb11d71bb update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1180
  $ cat >> $HGRCPATH <<EOF
f7ecb11d71bb update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1181
  > [experimental]
f7ecb11d71bb update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1182
  > evolutioncommands=evolve
f7ecb11d71bb update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1183
  > EOF
f7ecb11d71bb update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1184
  $ hg --hidden up 15
3747
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3702
diff changeset
  1185
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3702
diff changeset
  1186
  updated to hidden changeset daa1ff1c7fbd
3455
f7ecb11d71bb update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1187
  (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422)
f7ecb11d71bb update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1188
  working directory parent is obsolete! (daa1ff1c7fbd)
f7ecb11d71bb update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1189
  (use 'hg evolve' to update to its successor: 0c049e4e5422)
f7ecb11d71bb update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1190
1441
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1191
Restore all of the evolution features
1325
1fe3da0b4601 evolve: add --rev option to the evolve command
Laurent Charignon <lcharignon@fb.com>
parents: 1283
diff changeset
  1192
1441
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1193
  $ cat >> $HGRCPATH <<EOF
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1194
  > [experimental]
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1195
  > evolution=all
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1196
  > EOF
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1197
a4abe588d77f evolve: mechanism to load some commands selectively
Laurent Charignon <lcharignon@fb.com>
parents: 1428
diff changeset
  1198
Check hg evolve --rev on singled out commit
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1199
  $ hg up 98e171e2f272 -C
3455
f7ecb11d71bb update: show "use 'hg evolve' to..." hint iff evolve command enabled
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1200
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1354
b4a62d6f0353 evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents: 1350
diff changeset
  1201
  $ mkcommit j1
b4a62d6f0353 evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents: 1350
diff changeset
  1202
  $ mkcommit j2
b4a62d6f0353 evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents: 1350
diff changeset
  1203
  $ mkcommit j3
b4a62d6f0353 evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents: 1350
diff changeset
  1204
  $ hg up .^^
b4a62d6f0353 evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents: 1350
diff changeset
  1205
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b4a62d6f0353 evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents: 1350
diff changeset
  1206
  $ echo "hello" > j4
b4a62d6f0353 evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents: 1350
diff changeset
  1207
  $ hg add j4
b4a62d6f0353 evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents: 1350
diff changeset
  1208
  $ hg amend
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1209
  2 new orphan changesets
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1210
  $ glog -r "0cf3707e8971::"
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1211
  @  22:274b6cd0c101@default(draft) add j1
1354
b4a62d6f0353 evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents: 1350
diff changeset
  1212
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1213
  | *  21:89e4f7e8feb5@default(draft) add j3
1354
b4a62d6f0353 evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents: 1350
diff changeset
  1214
  | |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1215
  | *  20:4cd61236beca@default(draft) add j2
1354
b4a62d6f0353 evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents: 1350
diff changeset
  1216
  | |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1217
  | x  19:0fd8bfb02de4@default(draft) add j1
1354
b4a62d6f0353 evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents: 1350
diff changeset
  1218
  |/
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1219
  | o  18:0c049e4e5422@default(draft) add gh
1370
0799c5831a3d evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents: 1364
diff changeset
  1220
  | |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1221
  o |  17:98e171e2f272@default(draft) add gg
1370
0799c5831a3d evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents: 1364
diff changeset
  1222
  |/
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1223
  o  16:0cf3707e8971@default(draft) a3
1354
b4a62d6f0353 evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents: 1350
diff changeset
  1224
  |
1641
27445da063b7 tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1631
diff changeset
  1225
  ~
1354
b4a62d6f0353 evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents: 1350
diff changeset
  1226
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1227
  $ hg evolve --rev 89e4f7e8feb5 --any
1405
eaf82490af76 evolve: prevent using --rev and --any together
Laurent Charignon <lcharignon@fb.com>
parents: 1404
diff changeset
  1228
  abort: cannot specify both "--rev" and "--any"
eaf82490af76 evolve: prevent using --rev and --any together
Laurent Charignon <lcharignon@fb.com>
parents: 1404
diff changeset
  1229
  [255]
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1230
  $ hg evolve --rev 89e4f7e8feb5
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1231
  cannot solve instability of 89e4f7e8feb5, skipping
1354
b4a62d6f0353 evolve: don't crash on singled out revisions
Laurent Charignon <lcharignon@fb.com>
parents: 1350
diff changeset
  1232
1364
f00d91365ab9 evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1359
diff changeset
  1233
Check that uncommit respects the allowunstable option
f00d91365ab9 evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1359
diff changeset
  1234
With only createmarkers we can only uncommit on a head
f00d91365ab9 evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1359
diff changeset
  1235
  $ cat >> $HGRCPATH <<EOF
f00d91365ab9 evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1359
diff changeset
  1236
  > [experimental]
f00d91365ab9 evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1359
diff changeset
  1237
  > evolution=createmarkers, allnewcommands
f00d91365ab9 evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1359
diff changeset
  1238
  > EOF
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1239
  $ hg up 274b6cd0c101^
1370
0799c5831a3d evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents: 1364
diff changeset
  1240
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1364
f00d91365ab9 evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1359
diff changeset
  1241
  $ hg uncommit --all
2788
554c069cdc85 uncommit: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2782
diff changeset
  1242
  abort: uncommit will orphan 4 descendants
554c069cdc85 uncommit: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2782
diff changeset
  1243
  (see 'hg help evolution.instability')
1364
f00d91365ab9 evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1359
diff changeset
  1244
  [255]
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1245
  $ hg up 274b6cd0c101
1370
0799c5831a3d evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents: 1364
diff changeset
  1246
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1364
f00d91365ab9 evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1359
diff changeset
  1247
  $ hg uncommit --all
f00d91365ab9 evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1359
diff changeset
  1248
  new changeset is empty
1756
a7dcfff8c4a9 evolve: use single quotes in usage messages
Martin von Zweigbergk <martinvonz@google.com>
parents: 1753
diff changeset
  1249
  (use 'hg prune .' to remove it)
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1250
  $ glog -r "0cf3707e8971::"
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1251
  @  23:0ef9ff75f8e2@default(draft) add j1
1364
f00d91365ab9 evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1359
diff changeset
  1252
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1253
  | *  21:89e4f7e8feb5@default(draft) add j3
1370
0799c5831a3d evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents: 1364
diff changeset
  1254
  | |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1255
  | *  20:4cd61236beca@default(draft) add j2
1364
f00d91365ab9 evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1359
diff changeset
  1256
  | |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1257
  | x  19:0fd8bfb02de4@default(draft) add j1
1370
0799c5831a3d evolve: move test for evolve --rev ordering in a separate file
Laurent Charignon <lcharignon@fb.com>
parents: 1364
diff changeset
  1258
  |/
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1259
  | o  18:0c049e4e5422@default(draft) add gh
1364
f00d91365ab9 evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1359
diff changeset
  1260
  | |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1261
  o |  17:98e171e2f272@default(draft) add gg
1364
f00d91365ab9 evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1359
diff changeset
  1262
  |/
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1263
  o  16:0cf3707e8971@default(draft) a3
1364
f00d91365ab9 evolve: make uncommit respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1359
diff changeset
  1264
  |
1641
27445da063b7 tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1631
diff changeset
  1265
  ~
1397
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1266
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1267
Check that prune respects the allowunstable option
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1268
  $ hg up -C .
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1269
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1270
  $ hg up 0c049e4e5422
1422
c868a69c29c5 evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1414
diff changeset
  1271
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
c868a69c29c5 evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1414
diff changeset
  1272
  $ hg evolve --all
c868a69c29c5 evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1414
diff changeset
  1273
  nothing to evolve on current working copy parent
2834
38db1466c6fb log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents: 2832
diff changeset
  1274
  (2 other orphan in the repository, do you want --any or --rev)
1422
c868a69c29c5 evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1414
diff changeset
  1275
  [2]
c868a69c29c5 evolve: distinct between '--all' and '--all --any'
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1414
diff changeset
  1276
  $ hg evolve --all --any
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1277
  move:[20] add j2
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1278
  atop:[23] add j1
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1279
  move:[21] add j3
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1280
  $ glog -r "0cf3707e8971::"
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
  1281
  o  25:0d9203b74542@default(draft) add j3
1397
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1282
  |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1283
  o  24:f1b85956c48c@default(draft) add j2
1397
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1284
  |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1285
  o  23:0ef9ff75f8e2@default(draft) add j1
1397
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1286
  |
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
  1287
  | @  18:0c049e4e5422@default(draft) add gh
1397
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1288
  | |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1289
  o |  17:98e171e2f272@default(draft) add gg
1397
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1290
  |/
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1291
  o  16:0cf3707e8971@default(draft) a3
1397
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1292
  |
1641
27445da063b7 tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1631
diff changeset
  1293
  ~
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1294
  $ hg up 98e171e2f272
4577
bcd52ce0916d evolve: don't update after instability resolution by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4576
diff changeset
  1295
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1397
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1296
  $ mkcommit c5_
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1297
  created new head
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1298
  $ hg prune '0ef9ff75f8e2 + f1b85956c48c'
4445
0f2305921e4d prune: use action "prune", not "touch", in precheck
Martin von Zweigbergk <martinvonz@google.com>
parents: 4344
diff changeset
  1299
  abort: prune will orphan 1 descendants
2789
06ee4ec88190 prune: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2788
diff changeset
  1300
  (see 'hg help evolution.instability')
1397
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1301
  [255]
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1302
  $ hg prune '98e171e2f272::0d9203b74542'
4445
0f2305921e4d prune: use action "prune", not "touch", in precheck
Martin von Zweigbergk <martinvonz@google.com>
parents: 4344
diff changeset
  1303
  abort: prune will orphan 1 descendants
2789
06ee4ec88190 prune: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2788
diff changeset
  1304
  (see 'hg help evolution.instability')
1397
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1305
  [255]
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1306
  $ hg prune '0ef9ff75f8e2::'
1397
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1307
  3 changesets pruned
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1308
  $ glog -r "0cf3707e8971::"
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1309
  @  26:4c6f6f6d1976@default(draft) add c5_
1397
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1310
  |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1311
  | o  18:0c049e4e5422@default(draft) add gh
1397
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1312
  | |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1313
  o |  17:98e171e2f272@default(draft) add gg
1397
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1314
  |/
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1315
  o  16:0cf3707e8971@default(draft) a3
1397
35f2f54b557c evolve: make prune respect allowunsable
Laurent Charignon <lcharignon@fb.com>
parents: 1370
diff changeset
  1316
  |
1641
27445da063b7 tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1631
diff changeset
  1317
  ~
1398
7ddcbf5469bc evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents: 1397
diff changeset
  1318
7ddcbf5469bc evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents: 1397
diff changeset
  1319
Check that fold respects the allowunstable option
2767
ab80ef8d0cfa test: extract most fold testing into a test-fold module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2587
diff changeset
  1320
ab80ef8d0cfa test: extract most fold testing into a test-fold module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2587
diff changeset
  1321
(most of this has been moved to test-fold.t)
ab80ef8d0cfa test: extract most fold testing into a test-fold module
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2587
diff changeset
  1322
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1323
  $ hg up 0cf3707e8971
1398
7ddcbf5469bc evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents: 1397
diff changeset
  1324
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
7ddcbf5469bc evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents: 1397
diff changeset
  1325
  $ mkcommit unstableifparentisfolded
7ddcbf5469bc evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents: 1397
diff changeset
  1326
  created new head
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1327
  $ glog -r "0cf3707e8971::"
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1328
  @  27:2d1b55e10be9@default(draft) add unstableifparentisfolded
1398
7ddcbf5469bc evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents: 1397
diff changeset
  1329
  |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1330
  | o  26:4c6f6f6d1976@default(draft) add c5_
1398
7ddcbf5469bc evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents: 1397
diff changeset
  1331
  | |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1332
  +---o  18:0c049e4e5422@default(draft) add gh
1398
7ddcbf5469bc evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents: 1397
diff changeset
  1333
  | |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1334
  | o  17:98e171e2f272@default(draft) add gg
1398
7ddcbf5469bc evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents: 1397
diff changeset
  1335
  |/
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1336
  o  16:0cf3707e8971@default(draft) a3
1398
7ddcbf5469bc evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents: 1397
diff changeset
  1337
  |
1641
27445da063b7 tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1631
diff changeset
  1338
  ~
1398
7ddcbf5469bc evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents: 1397
diff changeset
  1339
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1340
  $ hg fold --exact "98e171e2f272::"
1398
7ddcbf5469bc evolve: make fold aware of allowunstable
Laurent Charignon <lcharignon@fb.com>
parents: 1397
diff changeset
  1341
  2 changesets folded
1428
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents: 1426
diff changeset
  1342
4585
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1343
Check that dirstate changes are kept at failure for conflicts (issue4966)
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1344
----------------------------------------
1428
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents: 1426
diff changeset
  1345
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents: 1426
diff changeset
  1346
  $ cat >> $HGRCPATH <<EOF
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents: 1426
diff changeset
  1347
  > [experimental]
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents: 1426
diff changeset
  1348
  > evolution=all
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents: 1426
diff changeset
  1349
  > EOF
20a3b0b27bfe evolve: raise MultipleSuccessorsError when computing dependency for split commits
Laurent Charignon <lcharignon@fb.com>
parents: 1426
diff changeset
  1350
1594
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1351
  $ echo "will be amended" > newfile
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1352
  $ hg commit -m "will be amended"
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1353
  $ hg parents
4585
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1354
  29	: will be amended - test
1594
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1355
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1356
  $ echo "will be evolved safely" >> a
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1357
  $ hg commit -m "will be evolved safely"
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1358
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1359
  $ echo "will cause conflict at evolve" > newfile
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1360
  $ echo "newly added" > newlyadded
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1361
  $ hg add newlyadded
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1362
  $ hg commit -m "will cause conflict at evolve"
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1363
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1364
  $ glog -r "0cf3707e8971::"
4585
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1365
  @  31:5be050657ca5@default(draft) will cause conflict at evolve
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1366
  |
4585
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1367
  o  30:748126f98ff1@default(draft) will be evolved safely
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1368
  |
4585
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1369
  o  29:4548f3a8db2c@default(draft) will be amended
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1370
  |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1371
  | o  28:92ca6f3984de@default(draft) add gg
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1372
  | |
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1373
  o |  27:2d1b55e10be9@default(draft) add unstableifparentisfolded
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1374
  |/
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1375
  | o  18:0c049e4e5422@default(draft) add gh
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1376
  |/
3374
612b3bd31499 evolve: use new trouble names in commit messages
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3359
diff changeset
  1377
  o  16:0cf3707e8971@default(draft) a3
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1378
  |
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1379
  ~
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1380
4585
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1381
  $ hg update -q -r "desc('will be amended')"
1594
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1382
  $ echo "amended" > newfile
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1383
  $ hg amend -m "amended"
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1384
  2 new orphan changesets
1594
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1385
4585
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1386
  $ hg evolve --rev "desc('will be amended')::"
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1387
  move:[30] will be evolved safely
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1388
  atop:[32] amended
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1389
  move:[31] will cause conflict at evolve
1594
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1390
  merging newfile
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1391
  warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3843
diff changeset
  1392
  fix conflicts and see `hg help evolve.interrupted`
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3843
diff changeset
  1393
  [1]
1594
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1394
4585
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1395
  $ glog -r "desc('add unstableifparentisfolded')::" --hidden
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1396
  @  33:b9acdb1af6d5@default(draft) will be evolved safely
1594
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1397
  |
4585
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1398
  o  32:6ec468e4cb98@default(draft) amended
1594
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1399
  |
4585
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1400
  | @  31:5be050657ca5@default(draft) will cause conflict at evolve
2929
06844693bb21 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net>
parents: 2858
diff changeset
  1401
  | |
4585
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1402
  | x  30:748126f98ff1@default(draft) will be evolved safely
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
  1403
  | |
4585
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1404
  | x  29:4548f3a8db2c@default(draft) will be amended
1594
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1405
  |/
4585
d871c8a92dee test: remove duplicated test
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4580
diff changeset
  1406
  o  27:2d1b55e10be9@default(draft) add unstableifparentisfolded
1594
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1407
  |
1641
27445da063b7 tests: adapt output to the new graphlog style
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1631
diff changeset
  1408
  ~
1594
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1409
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1410
  $ hg status newlyadded
de43a3e6b358 evolve: close transaction if conflict is detected in relocate (issue4966)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 1587
diff changeset
  1411
  A newlyadded
3855
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1412
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1413
  $ cd ..
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1414
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1415
Testing bookmark movement when `hg evolve` updates to successor (issue5923)
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1416
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1417
  $ hg init issue5923
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1418
  $ cd issue5923
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1419
  $ echo foo > a
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1420
  $ hg ci -Aqm "added a"
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1421
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1422
  $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n"
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1423
  @  0:f7ad41964313 added a
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1424
  
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1425
  $ echo bar >> a
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1426
  $ hg amend
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1427
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1428
  $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n"
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1429
  @  1:ab832e43dd5a added a
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1430
  
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1431
  $ hg up f7ad41964313 --hidden
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1432
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1433
  updated to hidden changeset f7ad41964313
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1434
  (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a)
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1435
  working directory parent is obsolete! (f7ad41964313)
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1436
  (use 'hg evolve' to update to its successor: ab832e43dd5a)
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1437
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1438
  $ hg bookmark book
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1439
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1440
  $ hg evolve
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1441
  update:[1] added a
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1442
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1443
  working directory is now at ab832e43dd5a
4580
3ef96578da43 evolve: use --all by default (BC)
Anton Shestakov <av6@dwimlabs.net>
parents: 4579
diff changeset
  1444
  no troubled changesets
3855
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1445
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1446
  $ hg log -GT "{rev}:{node|short} {desc} ({bookmarks})\n" --hidden
3856
9c0b37be8582 evolve: move the bookmarks also when updating to successor (issue5923)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3855
diff changeset
  1447
  @  1:ab832e43dd5a added a (book)
3855
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1448
  
3856
9c0b37be8582 evolve: move the bookmarks also when updating to successor (issue5923)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3855
diff changeset
  1449
  x  0:f7ad41964313 added a ()
3855
bce7afc21e1f tests: add test to demonstrate issue5923
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3852
diff changeset
  1450
  
4343
11b726506204 evolve: add test which shows orphan-merge resolution can result to crash
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4208
diff changeset
  1451
  $ cd ..