Mercurial Mercurial > pub > hg > evolve / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-options.t
author Manuel Jacob <me@manueljacob.de>
Wed, 11 Mar 2020 16:04:06 +0100
branchstable
changeset 5206 dc3571a37b56
parent 4185 9bce7e6c18b3
child 4354 cb39b767ad3c
permissions -rw-r--r--
evolve: support ancestor of orphan split with unrelated changeset in between This is done by searching for roots and heads within the range delimited on both sides by the target revs instead of just within the target revs. Example: o 5 | o 4 | o 3 | | * 2 | | | x 1 |/ o 0 1 is obsoleted by 3 and 5. We are considering the case when 2 gets evolved. Before the change, both roots and heads were [3, 5]. The user was offered a choice between 3 and 5 as the destination. After the change, roots are [3] and heads are [5]. 5 is chosen as the destination.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1226
901d2f4b21a9 config: allow disabling commands
Durham Goode <durham@fb.com>
parents:
diff changeset 
     1
 
  $ cat >> $HGRCPATH <<EOF
901d2f4b21a9 config: allow disabling commands
Durham Goode <durham@fb.com>
parents:
diff changeset 
     2
 
  > [ui]
901d2f4b21a9 config: allow disabling commands
Durham Goode <durham@fb.com>
parents:
diff changeset 
     3
 
  > logtemplate={rev}:{node|short}[{bookmarks}] ({obsolete}/{phase}) {desc|firstline}\n
901d2f4b21a9 config: allow disabling commands
Durham Goode <durham@fb.com>
parents:
diff changeset 
     4
 
  > [extensions]
901d2f4b21a9 config: allow disabling commands
Durham Goode <durham@fb.com>
parents:
diff changeset 
     5
 
  > EOF
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1226
diff changeset 
     6
 
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
1226
901d2f4b21a9 config: allow disabling commands
Durham Goode <durham@fb.com>
parents:
diff changeset 
     7
 












901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




     8


  $ mkcommit() {












901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




     9


  >    echo "$1" > "$1"












901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    10


  >    hg add "$1"












901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    11


  >    hg ci -m "add $1"












901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    12


  > }












901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    13














901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    14


  $ hg init repo












901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    15


  $ cd repo












901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    16


  $ mkcommit a












901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    17


  $ mkcommit b












901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    18














901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    19


test disabling commands












901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    20














901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    21


  $ cat >> .hg/hgrc <<EOF












901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    22


  > [experimental]












901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    23


  > evolution=createmarkers












901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    24


  >   allowunstable












901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    25


  >   exchange












901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    26


  > EOF







4185






9bce7e6c18b3
tests: remove a"| head -n 2" that just hides an error code



Martin von Zweigbergk <martinvonz@google.com>


parents: 
4181

diff
changeset




    27


  $ hg prune







1226






901d2f4b21a9
config: allow disabling commands



Durham Goode <durham@fb.com>


parents: 

diff
changeset




    28


  hg: unknown command 'prune'







4181






ab3581bc0637
branching: preserve the expected output on default



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4168

diff
changeset




    29


  (use 'hg help' for a list of commands)







4185






9bce7e6c18b3
tests: remove a"| head -n 2" that just hides an error code



Martin von Zweigbergk <martinvonz@google.com>


parents: 
4181

diff
changeset




    30


  [255]














evolve