Submitter | Boris Feld |
---|---|
Date | June 7, 2018, 2:11 p.m. |
Message ID | <98b3fa1f58c8da86a7d1.1528380665@Laptop-Boris.lan> |
Download | mbox | patch |
Permalink | /patch/32000/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -1277,7 +1277,7 @@ Try again but with a corrupted shelve st unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') [1] $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate - $ mv ../corrupt-shelvedstate .hg/histedit-state + $ mv ../corrupt-shelvedstate .hg/shelvestate $ hg unshelve --abort 2>&1 | grep 'aborted' unshelve of 'default-01' aborted $ hg summary