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-evolve-order.t
branchstable
changeset 1518 bca3fce56b2c
parent 1510 b86eea66ed02
child 1641 27445da063b7
equal deleted inserted replaced
1511:91b6a30424a3 1518:bca3fce56b2c 
   108   atop:[12] asecond
 
   108   atop:[12] asecond
 
   109   move:[7] add _c
 
   109   move:[7] add _c
 
   110   atop:[13] bprime
 
   110   atop:[13] bprime
 
   111   move:[8] add _d
 
   111   move:[8] add _d
 
   112   atop:[14] add _c
 
   112   atop:[14] add _c
 
   113   working directory is now at 225d2cc5d3fc
 
   113   working directory is now at 739f18ac1d03
 
   114   $ hg log -G
 
   114   $ hg log -G
 
   115   @  15:225d2cc5d3fc@default(draft) add _d
 
   115   @  15:739f18ac1d03@default(draft) add _d
 
   116   |
 
   116   |
 
   117   o  14:0fc229278e4d@default(draft) add _c
 
   117   o  14:e5960578d158@default(draft) add _c
 
   118   |
 
   118   |
 
   119   o  13:c3741b9eafae@default(draft) bprime
 
   119   o  13:4ad33fa88946@default(draft) bprime
 
   120   |
 
   120   |
 
   121   o  12:9a584314f3f3@default(draft) asecond
 
   121   o  12:9a584314f3f3@default(draft) asecond
 
   122   |
 
   122   |
 
   123   o  0:f92638be10c7@default(public) add p
 
   123   o  0:f92638be10c7@default(public) add p
 
   124   
   124   
   137   1 changesets pruned
 
   137   1 changesets pruned
 
   138   $ hg prune "desc(c1prime)" -s "desc(c1second)"
 
   138   $ hg prune "desc(c1prime)" -s "desc(c1second)"
 
   139   1 changesets pruned
 
   139   1 changesets pruned
 
   140   1 new unstable changesets
 
   140   1 new unstable changesets
 
   141   $ hg log -G -r "desc(_d)::"
 
   141   $ hg log -G -r "desc(_d)::"
 
   142   @  22:a329855d0bc1@default(draft) add c1second
 
   142   @  22:dcf786e878fd@default(draft) add c1second
 
   143   |
 
   143   |
 
   144   | o  21:072276ece1bf@default(draft) add c2prime
 
   144   | o  21:507d52d715f6@default(draft) add c2prime
 
   145   | |
 
   145   | |
 
   146   | x  20:f137acd06692@default(draft) add c1prime
 
   146   | x  20:c995cb124ddc@default(draft) add c1prime
 
   147   |/
 
   147   |/
 
   148   | o  19:0a1d9b2ce733@default(draft) add c4_
 
   148   | o  19:d096a2437fd0@default(draft) add c4_
 
   149   | |
 
   149   | |
 
   150   | o  18:e2874f41c56c@default(draft) add c3_
 
   150   | o  18:cde95c6cba7a@default(draft) add c3_
 
   151   | |
 
   151   | |
 
   152   | x  17:3247c33339fa@default(draft) add c2_
 
   152   | x  17:e0d9f7a099fe@default(draft) add c2_
 
   153   | |
 
   153   | |
 
   154   | x  16:df322257c182@default(draft) add c1_
 
   154   | x  16:43b7c338b1f8@default(draft) add c1_
 
   155   |/
 
   155   |/
 
   156   o  15:225d2cc5d3fc@default(draft) add _d
 
   156   o  15:739f18ac1d03@default(draft) add _d
 
   157   |
 
   157   |
 
   158 
   158 
   159 Second set of stack with no successor for b2_:
 
   159 Second set of stack with no successor for b2_:
 
   160   $ mkstack "desc(_d)" b1_ b2_ b3_ b4_ >/dev/null
 
   160   $ mkstack "desc(_d)" b1_ b2_ b3_ b4_ >/dev/null
 
   161   $ mkstack "desc(_d)" b1prime b3prime >/dev/null
 
   161   $ mkstack "desc(_d)" b1prime b3prime >/dev/null
 
   166   1 changesets pruned
 
   166   1 changesets pruned
 
   167   $ hg prune "desc(b2_)"
 
   167   $ hg prune "desc(b2_)"
 
   168   1 changesets pruned
 
   168   1 changesets pruned
 
   169 
   169 
   170   $ hg log -G -r "desc(_d)::"
 
   170   $ hg log -G -r "desc(_d)::"
 
   171   @  28:ba4c348b6d5e@default(draft) add b3prime
 
   171   @  28:b253ff5b65d1@default(draft) add b3prime
 
   172   |
 
   172   |
 
   173   o  27:8fe985f5d0aa@default(draft) add b1prime
 
   173   o  27:4acf61f11dfb@default(draft) add b1prime
 
   174   |
 
   174   |
 
   175   | o  26:1d9ba2e75c93@default(draft) add b4_
 
   175   | o  26:594e1fbbd61f@default(draft) add b4_
 
   176   | |
 
   176   | |
 
   177   | x  25:aec6a9657b6c@default(draft) add b3_
 
   177   | x  25:be27500cfc76@default(draft) add b3_
 
   178   | |
 
   178   | |
 
   179   | x  24:a69b58575918@default(draft) add b2_
 
   179   | x  24:b54f77dc5831@default(draft) add b2_
 
   180   | |
 
   180   | |
 
   181   | x  23:3564eb18e448@default(draft) add b1_
 
   181   | x  23:0e1eba27e9aa@default(draft) add b1_
 
   182   |/
 
   182   |/
 
   183   | o  22:a329855d0bc1@default(draft) add c1second
 
   183   | o  22:dcf786e878fd@default(draft) add c1second
 
   184   |/
 
   184   |/
 
   185   | o  21:072276ece1bf@default(draft) add c2prime
 
   185   | o  21:507d52d715f6@default(draft) add c2prime
 
   186   | |
 
   186   | |
 
   187   | x  20:f137acd06692@default(draft) add c1prime
 
   187   | x  20:c995cb124ddc@default(draft) add c1prime
 
   188   |/
 
   188   |/
 
   189   | o  19:0a1d9b2ce733@default(draft) add c4_
 
   189   | o  19:d096a2437fd0@default(draft) add c4_
 
   190   | |
 
   190   | |
 
   191   | o  18:e2874f41c56c@default(draft) add c3_
 
   191   | o  18:cde95c6cba7a@default(draft) add c3_
 
   192   | |
 
   192   | |
 
   193   | x  17:3247c33339fa@default(draft) add c2_
 
   193   | x  17:e0d9f7a099fe@default(draft) add c2_
 
   194   | |
 
   194   | |
 
   195   | x  16:df322257c182@default(draft) add c1_
 
   195   | x  16:43b7c338b1f8@default(draft) add c1_
 
   196   |/
 
   196   |/
 
   197   o  15:225d2cc5d3fc@default(draft) add _d
 
   197   o  15:739f18ac1d03@default(draft) add _d
 
   198   |
 
   198   |
 
   199 
   199 
   200 Solve the full second stack and only part of the first one
 
   200 Solve the full second stack and only part of the first one
 
   201   $ echo "(desc(_d)::) - desc(c3_)"
 
   201   $ echo "(desc(_d)::) - desc(c3_)"
 
   202   (desc(_d)::) - desc(c3_)
 
   202   (desc(_d)::) - desc(c3_)
 
   203   $ hg evolve --rev "(desc(_d)::) - desc(c3_)"
 
   203   $ hg evolve --rev "(desc(_d)::) - desc(c3_)"
 
   204   cannot solve instability of 0a1d9b2ce733, skipping
 
   204   cannot solve instability of d096a2437fd0, skipping
 
   205   move:[21] add c2prime
 
   205   move:[21] add c2prime
 
   206   atop:[22] add c1second
 
   206   atop:[22] add c1second
 
   207   move:[26] add b4_
 
   207   move:[26] add b4_
 
   208   atop:[28] add b3prime
 
   208   atop:[28] add b3prime
 
   209   working directory is now at 4897c8ed7645
 
   209   working directory is now at ea93190a9cd1
 
   210 
   210 
   211 Cleanup
 
   211 Cleanup
 
   212   $ hg evolve --rev "(desc(_d)::)"
 
   212   $ hg evolve --rev "(desc(_d)::)"
 
   213   move:[18] add c3_
 
   213   move:[18] add c3_
 
   214   atop:[29] add c2prime
 
   214   atop:[29] add c2prime
 
   215   move:[19] add c4_
 
   215   move:[19] add c4_
 
   216   atop:[31] add c3_
 
   216   atop:[31] add c3_
 
   217   working directory is now at 4ee8feb52325
 
   217   working directory is now at 35e7b797ace5
 
   218   $ hg log -G -r "desc(_d)::"
 
   218   $ hg log -G -r "desc(_d)::"
 
   219   @  32:4ee8feb52325@default(draft) add c4_
 
   219   @  32:35e7b797ace5@default(draft) add c4_
 
   220   |
 
   220   |
 
   221   o  31:08a530ce67e1@default(draft) add c3_
 
   221   o  31:0b9488394e89@default(draft) add c3_
 
   222   |
 
   222   |
 
   223   | o  30:4897c8ed7645@default(draft) add b4_
 
   223   | o  30:ea93190a9cd1@default(draft) add b4_
 
   224   | |
 
   224   | |
 
   225   o |  29:3abc7618dd5f@default(draft) add c2prime
 
   225   o |  29:881b9c092e53@default(draft) add c2prime
 
   226   | |
 
   226   | |
 
   227   | o  28:ba4c348b6d5e@default(draft) add b3prime
 
   227   | o  28:b253ff5b65d1@default(draft) add b3prime
 
   228   | |
 
   228   | |
 
   229   | o  27:8fe985f5d0aa@default(draft) add b1prime
 
   229   | o  27:4acf61f11dfb@default(draft) add b1prime
 
   230   | |
 
   230   | |
 
   231   o |  22:a329855d0bc1@default(draft) add c1second
 
   231   o |  22:dcf786e878fd@default(draft) add c1second
 
   232   |/
 
   232   |/
 
   233   o  15:225d2cc5d3fc@default(draft) add _d
 
   233   o  15:739f18ac1d03@default(draft) add _d
 
   234   |
 
   234   |
 
   235 
   235 
   236 Test multiple revision with some un-evolvable because parent is splitted
 
   236 Test multiple revision with some un-evolvable because parent is splitted
 
   237 ------------------------------------------------------------------------
 
   237 ------------------------------------------------------------------------
 
   238 
   238 
   256   $ hg amend -m 'b3second'
 
   256   $ hg amend -m 'b3second'
 
   257   1 new unstable changesets
 
   257   1 new unstable changesets
 
   258   $ hg evolve --rev 'unstable()'
 
   258   $ hg evolve --rev 'unstable()'
 
   259   move:[30] add b4_
 
   259   move:[30] add b4_
 
   260   atop:[35] b3second
 
   260   atop:[35] b3second
 
   261   skipping 08a530ce67e1: divergent rewriting. can't choose destination
 
   261   skipping 0b9488394e89: divergent rewriting. can't choose destination
 
   262   working directory is now at a51a8a82fdba
 
   262   working directory is now at 31809a198477
 
   263 
   263
evolve