Mercurial > evolve

comparison tests/test-evolve-issue5832.t @ 4074:eb4d07a0b19f mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-4.6
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 03 Sep 2018 21:59:24 +0200
parents ecbf61d90807
children f9a850018daa 4eb3877540f1
comparison
equal deleted inserted replaced
4030:9871809aa348 4074:eb4d07a0b19f
189 189
190 $ hg up bde1d2b6b5e5 190 $ hg up bde1d2b6b5e5
191 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 191 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
192 $ echo l > l 192 $ echo l > l
193 $ hg ci -Aqm "added l" 193 $ hg ci -Aqm "added l"
194 $ hg grab -r 1b24879c5c3c 194 $ hg pick -r 1b24879c5c3c
195 grabbing 1:1b24879c5c3c "added a" 195 picking 1:1b24879c5c3c "added a"
196 2 new orphan changesets 196 2 new orphan changesets
197 197
198 $ hg up bde1d2b6b5e5 198 $ hg up bde1d2b6b5e5
199 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 199 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
200 $ echo c > c 200 $ echo c > c
335 335
336 $ hg up bde1d2b6b5e5 336 $ hg up bde1d2b6b5e5
337 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 337 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
338 $ echo l > l 338 $ echo l > l
339 $ hg ci -Aqm "added l" 339 $ hg ci -Aqm "added l"
340 $ hg grab -r 1b24879c5c3c 340 $ hg pick -r 1b24879c5c3c
341 grabbing 1:1b24879c5c3c "added a" 341 picking 1:1b24879c5c3c "added a"
342 2 new orphan changesets 342 2 new orphan changesets
343 343
344 $ hg up bde1d2b6b5e5 344 $ hg up bde1d2b6b5e5
345 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 345 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
346 $ echo c > c 346 $ echo c > c