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-topic-stack-complex.t
branchmercurial-4.2
changeset 3288 b714709afe6a
parent 3287 4303a46b4167
child 3289 bd99cb54712b
child 3419 1e2f683e11e7
equal deleted inserted replaced
3287:4303a46b4167 3288:b714709afe6a 
     7   $ cat << EOF >> $HGRCPATH
 
     7   $ cat << EOF >> $HGRCPATH
 
     8   > [experimental]
 
     8   > [experimental]
 
     9   > evolution = all
 
     9   > evolution = all
 
    10   > [ui]
 
    10   > [ui]
 
    11   > interactive = True
 
    11   > interactive = True
 
       
    12   > [defaults]
 
       
    13   > split = -d "0 "0
 
    12   > [extensions]
 
    14   > [extensions]
 
    13   > show =
 
    15   > show =
 
    14   > EOF
 
    16   > EOF
 
    15   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
    17   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
    16 
    18 
    30   $ hg ci -Aqm "Added c and d"
 
    32   $ hg ci -Aqm "Added c and d"
 
    31   $ echo e > e
 
    33   $ echo e > e
 
    32   $ echo f > f
 
    34   $ echo f > f
 
    33   $ hg ci -Aqm "Added e and f"
 
    35   $ hg ci -Aqm "Added e and f"
 
    34   $ hg show work
 
    36   $ hg show work
 
    35   @  f1d36 (foo) Added e and f
 
    37   @  f1d36 Added e and f
 
    36   o  8e825 (foo) Added c and d
 
    38   o  8e825 Added c and d
 
    37   o  002b8 (foo) Added a and b
 
    39   o  002b8 Added a and b
 
    38   o  f3603 Added foo
 
    40   o  f3603 Added foo
 
    39 
    41 
    40 Testing in case of split within the topic
 
    42 Testing in case of split within the topic
 
    41 
    43 
    42   $ hg stack
 
    44   $ hg stack
 
    90   t2: split1
 
    92   t2: split1
 
    91   t1: Added a and b
 
    93   t1: Added a and b
 
    92   t0^ Added foo (base)
 
    94   t0^ Added foo (base)
 
    93 
    95 
    94   $ hg show work
 
    96   $ hg show work
 
    95   @  5ccee (foo) split2
 
    97   @  5ccee split2
 
    96   o  f26c1 (foo) split1
 
    98   o  f26c1 split1
 
    97   | o  f1d36 (foo) Added e and f
 
    99   | o  f1d36 Added e and f
 
    98   | x  8e825 (foo) Added c and d
 
   100   | x  8e825 Added c and d
 
    99   |/
 
   101   |/
 
   100   o  002b8 (foo) Added a and b
 
   102   o  002b8 Added a and b
 
   101   o  f3603 Added foo
 
   103   o  f3603 Added foo
 
   102 
   104 
   103   $ hg prev
 
   105   $ hg prev
 
   104   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   106   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   105   [4] split1
 
   107   [4] split1
 
   106   $ echo foo > c
 
   108   $ echo foo > c
 
   107   $ hg diff
 
   109   $ hg diff
 
   108   diff -r f26c1b9addde c
 
   110   diff -r f26c1b9addde c
 
   109   --- a/c	Thu Jan 01 00:00:00 1970 +0000
 
   111   --- a/c	Thu Jan 01 00:00:00 1970 +0000
 
   110   +++ b/c	Thu Jan 01 00:00:00 1970 +0000
 
   112   +++ b/c	* (glob)
 
   111   @@ -1,1 +1,1 @@
 
   113   @@ -1,1 +1,1 @@
 
   112   -c
 
   114   -c
 
   113   +foo
 
   115   +foo
 
   114 
   116 
   115   $ hg amend
 
   117   $ hg amend
 
   116   1 new unstable changesets
 
   118   1 new unstable changesets
 
   117   $ hg show work
 
   119   $ hg show work
 
   118   @  7d944 (foo) split1
 
   120   @  7d944 split1
 
   119   | o  5ccee (foo) split2
 
   121   | o  5ccee split2
 
   120   | x  f26c1 (foo) split1
 
   122   | x  f26c1 split1
 
   121   |/
 
   123   |/
 
   122   | o  f1d36 (foo) Added e and f
 
   124   | o  f1d36 Added e and f
 
   123   | x  8e825 (foo) Added c and d
 
   125   | x  8e825 Added c and d
 
   124   |/
 
   126   |/
 
   125   o  002b8 (foo) Added a and b
 
   127   o  002b8 Added a and b
 
   126   o  f3603 Added foo
 
   128   o  f3603 Added foo
 
   127 
   129 
   128   $ hg stack
 
   130   $ hg stack
 
   129   ### topic: foo (2 heads)
 
   131   ### topic: foo (2 heads)
 
   130   ### target: default (branch), 2 behind
 
   132   ### target: default (branch), 2 behind
evolve