Mercurial > hg
comparison tests/test-shelve.t @ 45860:073bb7563931
shelve: clear merge state after partial shelve
Differential Revision: https://phab.mercurial-scm.org/D9335
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 16 Nov 2020 21:28:42 -0800 |
parents | 781b09790633 |
children | 416ecdaa12df |
comparison
equal
deleted
inserted
replaced
45859:781b09790633 | 45860:073bb7563931 |
---|---|
808 $ hg st | 808 $ hg st |
809 M a/a | 809 M a/a |
810 ? foo/foo | 810 ? foo/foo |
811 $ hg bookmark | 811 $ hg bookmark |
812 \* test (4|13):33f7f61e6c5e (re) | 812 \* test (4|13):33f7f61e6c5e (re) |
813 BROKEN: there shouldn't be a merge state | 813 there shouldn't be a merge state |
814 $ hg resolve -l | 814 $ hg resolve -l |
815 R a/a | |
816 $ hg unshelve | 815 $ hg unshelve |
817 unshelving change 'test' | 816 unshelving change 'test' |
818 temporarily committing pending changes (restore with 'hg unshelve --abort') | 817 temporarily committing pending changes (restore with 'hg unshelve --abort') |
819 rebasing shelved changes | 818 rebasing shelved changes |
820 merging a/a | 819 merging a/a |