mrcrowl / vscode-hg

Integrated Mercurial source control for Visual Studio Code
MIT License
71 stars 37 forks source link

Support Rebase #113

Closed hdpoliveira closed 4 years ago

hdpoliveira commented 4 years ago

https://www.mercurial-scm.org/wiki/RebaseExtension

Proposal: three commands in the palette:

'Rebase current branch' will display a QuickPick for the destination (-d option), the same as the one used for 'Update to...'. Under the hood, we'll run 'hg rebase -b . -d ${destinationPicked}' If a conflict happens, we will open the SCM view, and open the first conflicted file in the editor. The user will be able to run 'Rebase: Continue' if all conflicts have been resolved, or 'Rebase: Abort' to drop the rebase operation.