Benedikt Eger beger
beger
/ mercurial_commands.sh
Last active
November 30, 2016 10:28
My list of mercurial commands that were useful in the past
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # revert a merge (1784 is the merge, 1780 is its parent in the current branch) | |
| hg backout --rev=1784 --parent=1780 | |
| # Branch mit anderem Branch überschreiben | |
| hg update -C Zielbranch | |
| hg -y merge --tool internal:fail Quellbranch | |
| hg revert --all --no-backup -r Quellbranch | |
| hg resolve --all --mark | |
| hg commit -m "revert and merge updating <Zielbranch> to current <Quellbranch>" |