View mtmsync.ps1
| cd media-type-map | |
| git pull https://enduracode.kilnhg.com/Code/Ewl/Dependencies/MediaTypeMap.git | |
| git push origin |
View hasync.ps1
| cd humanizer-annotations | |
| git pull https://enduracode.kilnhg.com/Code/Ewl/ReSharperAnnotations/Humanizer.git | |
| git push origin |
william-gross
/ nextMerge
Last active Aug 29, 2015
Mercurial revsets alias that lets you merge two complex branches while avoiding "criss-cross" merges
View nextMerge
| [revsetalias] | |
| # The first parameter is the merge destination. The second is the set of changesets that you'd ultimately like to merge. | |
| # If multiple changesets are returned, recursion is required. Please rerun with the head changeset as the second argument. | |
| # | |
| # Implementing this within Mercurial or as an extension would be better because we'd be able to automatically perform the recursion. | |
| nextMerge($1,$2) = nextMergeForSingleHead( $1, oldest( heads( $2 - ancestors($1) ) ) ) | |
| # In the following aliases, each parameter should be a single changeset. |
View ewlsync.ps1
| cd enterprise-web-library | |
| git pull https://enduracode.kilnhg.com/Code/Ewl/Group/Canonical.git | |
| git push origin |