Mercurial > hg
comparison tests/test-shelve.t @ 44210:d0c3eead515a
copies: fix crash when copy source is not in graft base
Differential Revision: https://phab.mercurial-scm.org/D8046
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 29 Jan 2020 23:14:31 -0800 |
parents | ae4d729eb3c8 |
children | f5c006621f07 |
comparison
equal
deleted
inserted
replaced
44209:ae4d729eb3c8 | 44210:d0c3eead515a |
---|---|
184 ! ghost | 184 ! ghost |
185 d | 185 d |
186 | 186 |
187 the common case - no options or filenames | 187 the common case - no options or filenames |
188 | 188 |
189 $ hg shelve 2>&1 | grep KeyError | 189 $ hg shelve |
190 KeyError: 'No such manifest entry.' (no-pure !) | 190 shelved as default-01 |
191 raise KeyError (pure !) | 191 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
192 KeyError (pure !) | |
193 # Get out of the broken state so later tests work | |
194 $ hg forget b.rename/b c.copy ghost | |
195 $ hg revert a/a b/b d | |
196 $ rm a/a.orig b.rename/b c.copy | |
197 $ hg status -C | 192 $ hg status -C |
198 | 193 |
199 ensure that our shelved changes exist | 194 ensure that our shelved changes exist |
200 | 195 |
201 $ hg shelve -l | 196 $ hg shelve -l |
394 ensure that we have a merge with unresolved conflicts | 389 ensure that we have a merge with unresolved conflicts |
395 | 390 |
396 #if phasebased | 391 #if phasebased |
397 $ hg heads -q --template '{rev}\n' | 392 $ hg heads -q --template '{rev}\n' |
398 8 | 393 8 |
399 6 | 394 5 |
400 $ hg parents -q --template '{rev}\n' | 395 $ hg parents -q --template '{rev}\n' |
401 8 | 396 8 |
402 6 | 397 5 |
403 #endif | 398 #endif |
404 | 399 |
405 #if stripbased | 400 #if stripbased |
406 $ hg heads -q --template '{rev}\n' | 401 $ hg heads -q --template '{rev}\n' |
407 5 | 402 5 |