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-stabilize-order.t
branchstable
changeset 499 a9c27df23129
parent 492 7ecd41520dae
child 546 415540dee2bd
equal deleted inserted replaced
476:f17a0f801e0b 499:a9c27df23129 
     3   > amend=-d "0 0"
 
     3   > amend=-d "0 0"
 
     4   > [extensions]
 
     4   > [extensions]
 
     5   > hgext.rebase=
 
     5   > hgext.rebase=
 
     6   > hgext.graphlog=
 
     6   > hgext.graphlog=
 
     7   > EOF
 
     7   > EOF
 
     8   $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
 
       
     9   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
 
     8   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
 
    10 
     9 
    11   $ glog() {
 
    10   $ glog() {
 
    12   >   hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@"
 
    11   >   hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@"
 
    13   > }
 
    12   > }
 
    38   $ hg gdown
 
    37   $ hg gdown
 
    39   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
    38   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
    40   [2] addb
 
    39   [2] addb
 
    41   $ echo b >> b
 
    40   $ echo b >> b
 
    42   $ hg amend
 
    41   $ hg amend
 
    43   1 new unstables changesets
 
    42   1 new unstable changesets
 
    44   $ hg gdown
 
    43   $ hg gdown
 
    45   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
    44   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
    46   [1] adda
 
    45   [1] adda
 
    47   $ echo a >> a
 
    46   $ echo a >> a
 
    48   $ hg amend
 
    47   $ hg amend
 
    49   1 new unstables changesets
 
    48   1 new unstable changesets
 
    50   $ glog
 
    49   $ glog
 
    51   @  7:f5ff10856e5a@default(draft) adda
 
    50   @  7:f5ff10856e5a@default(draft) adda
 
    52   |
 
    51   |
 
    53   | o  5:ab8cbb6d87ff@default(draft) addb
 
    52   | o  5:ab8cbb6d87ff@default(draft) addb
 
    54   | |
 
    53   | |
 
    55   | | o  3:7a7552255fb5@default(draft) addc
 
    54   | | o  3:7a7552255fb5@default(draft) addc
 
    56   | | |
 
    55   | | |
 
    57   | | o  2:ef23d6ef94d6@default(draft) addb
 
    56   | | x  2:ef23d6ef94d6@default(draft) addb
 
    58   | |/
 
    57   | |/
 
    59   | o  1:93418d2c0979@default(draft) adda
 
    58   | x  1:93418d2c0979@default(draft) adda
 
    60   |/
 
    59   |/
 
    61   o  0:c471ef929e6a@default(draft) addroot
 
    60   o  0:c471ef929e6a@default(draft) addroot
 
    62   
    61   
    63 
    62 
    64 Test stabilizing a predecessor child
 
    63 Test stabilizing a predecessor child
 
    65 
    64 
    66   $ hg stabilize -v
 
    65   $ hg evolve -v
 
    67   move:[5] addb
 
    66   move:[5] addb
 
    68   atop:[7] adda
 
    67   atop:[7] adda
 
    69   hg rebase -Dr ab8cbb6d87ff -d f5ff10856e5a
 
    68   hg rebase -Dr ab8cbb6d87ff -d f5ff10856e5a
 
    70   resolving manifests
 
    69   resolving manifests
 
    71   getting b
 
    70   getting b
 
    75   |
 
    74   |
 
    76   o  7:f5ff10856e5a@default(draft) adda
 
    75   o  7:f5ff10856e5a@default(draft) adda
 
    77   |
 
    76   |
 
    78   | o  3:7a7552255fb5@default(draft) addc
 
    77   | o  3:7a7552255fb5@default(draft) addc
 
    79   | |
 
    78   | |
 
    80   | o  2:ef23d6ef94d6@default(draft) addb
 
    79   | x  2:ef23d6ef94d6@default(draft) addb
 
    81   | |
 
    80   | |
 
    82   | o  1:93418d2c0979@default(draft) adda
 
    81   | x  1:93418d2c0979@default(draft) adda
 
    83   |/
 
    82   |/
 
    84   o  0:c471ef929e6a@default(draft) addroot
 
    83   o  0:c471ef929e6a@default(draft) addroot
 
    85   
    84   
    86 
    85 
    87 Test stabilizing a descendant predecessors child
 
    86 Test stabilizing a descendant predecessors child
 
    88 
    87 
    89   $ hg up 7
 
    88   $ hg up 7
 
    90   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
    89   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
    91   $ hg debugsuccessors > successors.old
 
    90   $ hg debugobsolete > successors.old
 
    92   $ hg stabilize -v
 
    91   $ hg evolve -v
 
    93   move:[3] addc
 
    92   move:[3] addc
 
    94   atop:[8] addb
 
    93   atop:[8] addb
 
    95   hg rebase -Dr 7a7552255fb5 -d 6bf44048e43f
 
    94   hg rebase -Dr 7a7552255fb5 -d 6bf44048e43f
 
    96   resolving manifests
 
    95   resolving manifests
 
    97   getting b
 
    96   getting b
 
    98   resolving manifests
 
    97   resolving manifests
 
    99   getting c
 
    98   getting c
 
   100   c
 
    99   c
 
   101   $ hg debugsuccessors > successors.new
 
   100   $ hg debugobsolete > successors.new
 
   102   $ diff -u successors.old successors.new
 
   101   $ diff -u successors.old successors.new
 
   103   --- successors.old* (glob)
 
   102   --- successors.old* (glob)
 
   104   +++ successors.new* (glob)
 
   103   +++ successors.new* (glob)
 
   105   @@ -1,5 +1,6 @@
 
   104   @@ -3,3 +3,4 @@
 
   106    3a4a591493f8 f5ff10856e5a
 
   105    3a4a591493f80708e46f2bf6d3b4debfad8ff91e f5ff10856e5ab3c8dc420b9c11460e6832a3b78c 0 {'date': '* *', 'user': 'test'} (glob)
 
   107    3ca0ded0dc50 ab8cbb6d87ff
 
   106    93418d2c0979643ad446f621195e78720edb05b4 f5ff10856e5ab3c8dc420b9c11460e6832a3b78c 0 {'date': '* *', 'user': 'test'} (glob)
 
   108   +7a7552255fb5 5e819fbb0d27
 
   107    ab8cbb6d87ff3ab5526735a051cba6b63f3d6775 6bf44048e43f830accbf7d2bd7bc252ad7a3b99c 0 {'date': '* *', 'user': 'test'} (glob)
 
   109    93418d2c0979 f5ff10856e5a
 
   108   +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 5e819fbb0d278117c0a83b7f6f6486689732cfb2 0 {'date': '* *', 'user': 'test'} (glob)
 
   110    ab8cbb6d87ff 6bf44048e43f
 
       
   111    ef23d6ef94d6 ab8cbb6d87ff
 
       
   112   [1]
 
   109   [1]
 
   113   $ glog
 
   110   $ glog
 
   114   @  9:5e819fbb0d27@default(draft) addc
 
   111   @  9:5e819fbb0d27@default(draft) addc
 
   115   |
 
   112   |
 
   116   o  8:6bf44048e43f@default(draft) addb
 
   113   o  8:6bf44048e43f@default(draft) addb
 
   117   |
 
   114   |
 
   118   o  7:f5ff10856e5a@default(draft) adda
 
   115   o  7:f5ff10856e5a@default(draft) adda
 
   119   |
 
   116   |
 
   120   o  0:c471ef929e6a@default(draft) addroot
 
   117   o  0:c471ef929e6a@default(draft) addroot
 
   121   
   118   
   122   $ hg stabilize -v
 
   119   $ hg evolve -v
 
   123   no unstable changeset
 
   120   no troubled changeset
 
   124   [1]
 
   121   [1]
 
   125 
   122 
   126 Test behaviour with --any
 
   123 Test behaviour with --any
 
   127 
   124 
   128   $ hg up 8
 
   125   $ hg up 8
 
   129   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   126   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   130   $ echo b >> b
 
   127   $ echo b >> b
 
   131   $ hg amend
 
   128   $ hg amend
 
   132   1 new unstables changesets
 
   129   1 new unstable changesets
 
   133   $ glog
 
   130   $ glog
 
   134   @  11:4e7cec6b4afe@default(draft) addb
 
   131   @  11:4e7cec6b4afe@default(draft) addb
 
   135   |
 
   132   |
 
   136   | o  9:5e819fbb0d27@default(draft) addc
 
   133   | o  9:5e819fbb0d27@default(draft) addc
 
   137   | |
 
   134   | |
 
   138   | o  8:6bf44048e43f@default(draft) addb
 
   135   | x  8:6bf44048e43f@default(draft) addb
 
   139   |/
 
   136   |/
 
   140   o  7:f5ff10856e5a@default(draft) adda
 
   137   o  7:f5ff10856e5a@default(draft) adda
 
   141   |
 
   138   |
 
   142   o  0:c471ef929e6a@default(draft) addroot
 
   139   o  0:c471ef929e6a@default(draft) addroot
 
   143   
   140   
   144   $ hg up 9
 
   141   $ hg up 9
 
   145   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   142   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   146   $ hg stabilize -v
 
   143   $ hg evolve -v
 
   147   nothing to stabilize here
 
   144   nothing to evolve here
 
   148   (1 unstable changesets, do you want --any ?)
 
   145   (1 troubled changesets, do you want --any ?)
 
   149   [2]
 
   146   [2]
 
   150   $ hg stabilize --any -v
 
   147   $ hg evolve --any -v
 
   151   move:[9] addc
 
   148   move:[9] addc
 
   152   atop:[11] addb
 
   149   atop:[11] addb
 
   153   hg rebase -Dr 5e819fbb0d27 -d 4e7cec6b4afe
 
   150   hg rebase -Dr 5e819fbb0d27 -d 4e7cec6b4afe
 
   154   resolving manifests
 
   151   resolving manifests
 
   155   removing c
 
   152   removing c
 
   164   |
 
   161   |
 
   165   o  7:f5ff10856e5a@default(draft) adda
 
   162   o  7:f5ff10856e5a@default(draft) adda
 
   166   |
 
   163   |
 
   167   o  0:c471ef929e6a@default(draft) addroot
 
   164   o  0:c471ef929e6a@default(draft) addroot
 
   168   
   165   
   169   $ hg stabilize --any -v
 
   166   $ hg evolve --any -v
 
   170   no unstable changeset
 
   167   no troubled changeset
 
   171   [1]
 
   168   [1]
evolve