Mercurial > evolve

comparison tests/test-evolve-stop-phasediv.t @ 5811:4688b7eb7e40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: preserve wdir when using --stop After this change using hg evolve --stop update the working copy parent back to where the working copy was before the hg evolve operation (or the successors of that)
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Wed, 26 Aug 2020 23:27:17 +0530
parents c5dfbbe4363d
children fd039a7f0c3c 29bc269bcc96
comparison
equal deleted inserted replaced
5810:0a364a0aba27 5811:4688b7eb7e40
96 (see 'hg help evolve.interrupted') 96 (see 'hg help evolve.interrupted')
97 [240] 97 [240]
98 98
99 $ hg evolve --stop 99 $ hg evolve --stop
100 stopped the interrupted evolve 100 stopped the interrupted evolve
101 working directory is now at ca1b80f7960a 101 working directory is now at ddba58020bc0
102 102
103 XXX: maybe we should update wdir to where it was
104 $ hg glog 103 $ hg glog
105 * 6:ddba58020bc0 added d 104 @ 6:ddba58020bc0 added d
106 | () draft 105 | () draft
107 | o 4:c41c793e0ef1 added d 106 | o 4:c41c793e0ef1 added d
108 | | () public 107 | | () public
109 | @ 3:ca1b80f7960a added c 108 | o 3:ca1b80f7960a added c
110 | | () public 109 | | () public
111 | o 2:b1661037fa25 added b 110 | o 2:b1661037fa25 added b
112 |/ () public 111 |/ () public
113 o 1:c7586e2a9264 added a 112 o 1:c7586e2a9264 added a
114 | () public 113 | () public