XMLWordPrintable

    • Type: Bug
    • Resolution: Unresolved
    • Priority: High
    • None
    • Affects Version/s: None
    • Component/s: Mercurial
    • None
    • Environment:

      Windows 10

    • Severity 1 - Critical

      Shelve is horribly HORRIBLY broken.

      It took me a goddamn hour to fix my repo after shelving a change. Here's what I did:

       

      1) Have some changes in the working dir.

      2) Realize I'm on the wrong branch

      3) Switch to default branch

      4) Get an erro saying that I have uncomitted changed. So what?? Switch the goddamn branch!!

      5) Give up and shelve my changes

      6) Switch to default branch

      7) Make the branch I'm suposed to commit in

      8) Switch to it

      9) Unshelve my changes

      10) This produces some conflicts

      11) Solve the conflicts

      12) Commit

      13) Error: unshelve already in progress. WTF? Just let me commit my goddamn code!! SourceTree, if you get this error, solve it yourself. Don't tell me to execute some command.

      14) Try the suggestion (hg unshelve –continue). Doesn't work. The "unshelve" command doesn't exist. So don't bloody suggest it then, FFS!!

      15) I also can't update to a previous commit. Same error.

      16) Ohh, I can strip to a previous commit. But any path will lead to the same error again.

      17) Delete the shelve and try yet again. Same error. An unshelve is already in progress... with 0 shelves existing. Absolutely bloody brilliant this.

      18) Try the same thing from WLS. Doesn't work. Unshelve can be installed from there, but it says it's the wrong version. I'm done with this now. I'm going to resort to unreasonable force.

      19) Go into my repo\.hg, and DELETE every file that has the word "shelve" in the name.

      20) Fixed. FINALLY.

       

      Please, Atlassian, this is utterly ridiculous. It shouldn't be so goddamn hard to switch branches while already having some changes. Test those features, and test them well please.

      I almost lost my work a few times. That's quite the opposite of SourceTree's purpose, innit. Good thing I created a patch file.

       

      Btw, I'm on 2.4.8.0, but this Jira says that version doesn't exist. It sure does.

            Assignee:
            Unassigned
            Reporter:
            madeinjapan
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated: