Mercurial > evolve

comparison tests/test-evolve-abort-orphan.t @ 6403:567cc86f2d01 mercurial-4.8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.9 into mercurial-4.8
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 07 Feb 2023 15:07:02 +0400
parents 6b67f26f4667 716912541759
children 5f77d112be57
comparison
equal deleted inserted replaced
6357:af69ae146159 6403:567cc86f2d01
139 $ hg resolve -m 139 $ hg resolve -m
140 (no more unresolved files) 140 (no more unresolved files)
141 continue: hg evolve --continue 141 continue: hg evolve --continue
142 $ hg evolve --continue 142 $ hg evolve --continue
143 evolving 4:c41c793e0ef1 "added d" 143 evolving 4:c41c793e0ef1 "added d"
144 working directory is now at e83de241f751 144 working directory is now at 69c43da639bb
145 145
146 $ hg up .^^^ 146 $ hg up .^^^
147 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 147 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
148 148
149 When there are evolved revisions but on a single branch 149 When there are evolved revisions but on a single branch
185 $ hg glog 185 $ hg glog
186 @ 8:0c41ec482070 added b 186 @ 8:0c41ec482070 added b
187 | () draft 187 | () draft
188 o 7:125af0ed8cae added a 188 o 7:125af0ed8cae added a
189 | () draft 189 | () draft
190 | * 6:e83de241f751 added d 190 | * 6:69c43da639bb added d
191 | | () draft orphan 191 | | () draft orphan
192 | * 5:e93a9161a274 added c 192 | * 5:e93a9161a274 added c
193 | | () draft orphan 193 | | () draft orphan
194 | x 2:b1661037fa25 added b 194 | x 2:b1661037fa25 added b
195 | | () draft 195 | | () draft
204 working directory is now at 125af0ed8cae 204 working directory is now at 125af0ed8cae
205 205
206 $ hg glog 206 $ hg glog
207 @ 7:125af0ed8cae added a 207 @ 7:125af0ed8cae added a
208 | () draft 208 | () draft
209 | * 6:e83de241f751 added d 209 | * 6:69c43da639bb added d
210 | | () draft orphan 210 | | () draft orphan
211 | * 5:e93a9161a274 added c 211 | * 5:e93a9161a274 added c
212 | | () draft orphan 212 | | () draft orphan
213 | * 2:b1661037fa25 added b 213 | * 2:b1661037fa25 added b
214 | | () draft orphan 214 | | () draft orphan