Mercurial Mercurial > pub > hg > evolve / comparison
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-evolution.t
changeset 113 3bdabdbb4140
parent 94 780a222d547d
child 116 64ca29eef349
equal deleted inserted replaced
112:eae9be0ee00e 113:3bdabdbb4140 
     1   $ cat >> $HGRCPATH <<EOF
 
     1   $ cat >> $HGRCPATH <<EOF
 
       
     2   > [defaults]
 
       
     3   > amend=-d "0 0"
 
     2   > [web]
 
     4   > [web]
 
     3   > push_ssl = false
 
     5   > push_ssl = false
 
     4   > allow_push = *
 
     6   > allow_push = *
 
       
     7   > [phases]
 
       
     8   > publish = False
 
     5   > [alias]
 
     9   > [alias]
 
     6   > qlog = log --template='{rev} - {node|short} {desc} ({state})\n'
 
    10   > qlog = log --template='{rev} - {node|short} {desc} ({phase})\n'
 
     7   > [diff]
 
    11   > [diff]
 
     8   > git = 1
 
    12   > git = 1
 
     9   > unified = 0
 
    13   > unified = 0
 
    10   > [extensions]
 
    14   > [extensions]
 
    11   > hgext.rebase=
 
    15   > hgext.rebase=
 
    12   > EOF
 
    16   > hgext.graphlog=
 
    13   $ echo "states=$(echo $(dirname $TESTDIR))/hgext/states.py" >> $HGRCPATH
 
    17   > EOF
 
    14   $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
 
    18   $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
 
    15   $ echo "evolution=$(echo $(dirname $TESTDIR))/hgext/evolution.py" >> $HGRCPATH
 
    19   $ echo "evolution=$(echo $(dirname $TESTDIR))/hgext/evolution.py" >> $HGRCPATH
 
    16   $ mkcommit() {
 
    20   $ mkcommit() {
 
    17   >    echo "$1" > "$1"
 
    21   >    echo "$1" > "$1"
 
    18   >    hg add "$1"
 
    22   >    hg add "$1"
 
    21 
    25 
    22 various init
 
    26 various init
 
    23 
    27 
    24   $ hg init local
 
    28   $ hg init local
 
    25   $ cd local
 
    29   $ cd local
 
    26   $ hg states ready # XXX should be put in default config when state support it
 
       
    27   $ mkcommit a
 
    30   $ mkcommit a
 
    28   $ mkcommit b
 
    31   $ mkcommit b
 
       
    32   $ cat >> .hg/hgrc << EOF
 
       
    33   > [phases]
 
       
    34   > publish = True
 
       
    35   > EOF
 
       
    36   $ hg pull -q . # make 1 public
 
       
    37   $ rm .hg/hgrc
 
    29   $ mkcommit c
 
    38   $ mkcommit c
 
    30   $ mkcommit d
 
    39   $ mkcommit d
 
    31   $ hg up 1
 
    40   $ hg up 1
 
    32   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
    41   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
    33   $ mkcommit e -q
 
    42   $ mkcommit e -q
 
    34   created new head
 
    43   created new head
 
    35   $ mkcommit f
 
    44   $ mkcommit f
 
    36   $ hg published 1
 
       
    37   $ hg qlog
 
    45   $ hg qlog
 
    38   5 - e44648563c73 add f (ready)
 
    46   5 - e44648563c73 add f (1)
 
    39   4 - fbb94e3a0ecf add e (ready)
 
    47   4 - fbb94e3a0ecf add e (1)
 
    40   3 - 47d2a3944de8 add d (ready)
 
    48   3 - 47d2a3944de8 add d (1)
 
    41   2 - 4538525df7e2 add c (ready)
 
    49   2 - 4538525df7e2 add c (1)
 
    42   1 - 7c3bad9141dc add b (published)
 
    50   1 - 7c3bad9141dc add b (0)
 
    43   0 - 1f0dee641bb7 add a (published)
 
    51   0 - 1f0dee641bb7 add a (0)
 
    44 
    52 
    45 test simple kill
 
    53 test simple kill
 
    46 
    54 
    47   $ hg kill 5
 
    55   $ hg kill 5
 
    48   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
    56   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
    49   working directory now at fbb94e3a0ecf
 
    57   working directory now at fbb94e3a0ecf
 
    50   $ hg qlog
 
    58   $ hg qlog
 
    51   4 - fbb94e3a0ecf add e (ready)
 
    59   4 - fbb94e3a0ecf add e (1)
 
    52   3 - 47d2a3944de8 add d (ready)
 
    60   3 - 47d2a3944de8 add d (1)
 
    53   2 - 4538525df7e2 add c (ready)
 
    61   2 - 4538525df7e2 add c (1)
 
    54   1 - 7c3bad9141dc add b (published)
 
    62   1 - 7c3bad9141dc add b (0)
 
    55   0 - 1f0dee641bb7 add a (published)
 
    63   0 - 1f0dee641bb7 add a (0)
 
    56 
    64 
    57 test multiple kill
 
    65 test multiple kill
 
    58 
    66 
    59   $ hg kill 4 3
 
    67   $ hg kill 4 3
 
    60   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
    68   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
    61   working directory now at 7c3bad9141dc
 
    69   working directory now at 7c3bad9141dc
 
    62   $ hg qlog
 
    70   $ hg qlog
 
    63   2 - 4538525df7e2 add c (ready)
 
    71   2 - 4538525df7e2 add c (1)
 
    64   1 - 7c3bad9141dc add b (published)
 
    72   1 - 7c3bad9141dc add b (0)
 
    65   0 - 1f0dee641bb7 add a (published)
 
    73   0 - 1f0dee641bb7 add a (0)
 
    66   $ cd ..
 
    74   $ cd ..
 
    67 
    75 
    68 ##########################
 
    76 ##########################
 
    69 importing Parren test
 
    77 importing Parren test
 
    70 ##########################
 
    78 ##########################
 
    81 -------------------
 
    89 -------------------
 
    82 
    90 
    83 We start with a plain base repo::
 
    91 We start with a plain base repo::
 
    84 
    92 
    85   $ hg init main; cd main
 
    93   $ hg init main; cd main
 
    86   $ hg states ready
 
       
    87   $ cat >main-file-1 <<-EOF
 
    94   $ cat >main-file-1 <<-EOF
 
    88   > One
 
    95   > One
 
    89   > 
    96   > 
    90   > Two
 
    97   > Two
 
    91   > 
    98   > 
   102 
   109 
   103   $ hg clone main work
 
   110   $ hg clone main work
 
   104   updating to branch default
 
   111   updating to branch default
 
   105   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   112   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   106   $ cd work
 
   113   $ cd work
 
   107   $ hg states ready
 
       
   108 
   114 
   109 
   115 
   110 Create First Patch
 
   116 Create First Patch
 
   111 ------------------
 
   117 ------------------
 
   112 
   118 
   200   6	feature-A: a nifty feature - test
 
   206   6	feature-A: a nifty feature - test
 
   201   4	feature-B: another feature - test
 
   207   4	feature-B: another feature - test
 
   202   1	: a nifty feature - test
 
   208   1	: a nifty feature - test
 
   203   0	: base - test
 
   209   0	: base - test
 
   204   $ hg evolve
 
   210   $ hg evolve
 
   205   hg relocate --rev 8c7704f377af 1075109f9999
 
   211   hg relocate --rev f8111a076f09 23409eba69a0
 
   206   $ hg up feature-B -q #prevent feature-A bookmark to move grml
 
   212   $ hg up feature-B -q #prevent feature-A bookmark to move grml
 
   207   $ hg relocate -r 4 6 --traceback
 
   213   $ hg relocate -r 4 6 --traceback
 
   208   merging main-file-1
 
   214   merging main-file-1
 
   209   $ hg log
 
   215   $ hg log
 
   210   7	feature-B: another feature - test
 
   216   7	feature-B: another feature - test
evolve