Mercurial > hg
comparison hgext/shelve.py @ 26992:b3b5ed560283
shelve: switch to mergestate.read()
See previous patches for why we're doing this.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 17 Nov 2015 13:56:10 -0800 |
parents | d55d22840592 |
children | 5cf184398ee7 |
comparison
equal
deleted
inserted
replaced
26991:2ddc92bae4a7 | 26992:b3b5ed560283 |
---|---|
529 # parent, second is the temporary "fake" commit we're unshelving. | 529 # parent, second is the temporary "fake" commit we're unshelving. |
530 wlock = repo.wlock() | 530 wlock = repo.wlock() |
531 lock = None | 531 lock = None |
532 try: | 532 try: |
533 checkparents(repo, state) | 533 checkparents(repo, state) |
534 ms = merge.mergestate(repo) | 534 ms = merge.mergestate.read(repo) |
535 if [f for f in ms if ms[f] == 'u']: | 535 if [f for f in ms if ms[f] == 'u']: |
536 raise error.Abort( | 536 raise error.Abort( |
537 _("unresolved conflicts, can't continue"), | 537 _("unresolved conflicts, can't continue"), |
538 hint=_("see 'hg resolve', then 'hg unshelve --continue'")) | 538 hint=_("see 'hg resolve', then 'hg unshelve --continue'")) |
539 | 539 |