Mercurial > evolve

comparison tests/test-evolve-stop-orphan.t @ 6504:db0fd1f1a7d0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: capture .hg/merge/state presence as well
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 25 May 2023 11:08:09 -0300
parents f6d12afe8322
children 019da9cc0ac5
comparison
equal deleted inserted replaced
6503:f6d12afe8322 6504:db0fd1f1a7d0
161 bar 161 bar
162 +======= 162 +=======
163 +foo 163 +foo
164 +>>>>>>> evolving: c41c793e0ef1 - test: added d 164 +>>>>>>> evolving: c41c793e0ef1 - test: added d
165 165
166 we do have a evolvestate file before the --stop 166 We do have state files for evolve and merge before the --stop
167 $ ls .hg/ | grep evolvestate 167 $ find .hg/ -name '*state' | grep -v dirstate | sort
168 evolvestate 168 .hg/evolvestate
169 .hg/merge/state
169 170
170 $ hg evolve --stop 171 $ hg evolve --stop
171 stopped the interrupted evolve 172 stopped the interrupted evolve
172 173
173 $ hg glog 174 $ hg glog
184 o 0:8fa14d15e168 added hgignore 185 o 0:8fa14d15e168 added hgignore
185 () draft 186 () draft
186 187
187 $ hg status 188 $ hg status
188 189
189 The state file is gone after the --stop 190 The state files are gone after the --stop
190 191 $ find .hg/ -name '*state' | grep -v dirstate
191 $ ls .hg/ | grep evolvestate
192 [1] 192 [1]
193 193
194 Checking when multiple revs need to be evolved, some revs evolve without 194 Checking when multiple revs need to be evolved, some revs evolve without
195 conflicts 195 conflicts
196 ========================================================================= 196 =========================================================================