Mercurial > hg > config
view bin/hg-merge-branch.sh @ 847:6c918c07d0e3
[gpg] make a front-end to add a line to a gpg symmetrically encrypted file
author | Jeff Hammel <k0scist@gmail.com> |
---|---|
date | Tue, 17 Oct 2017 11:59:09 -0700 |
parents | cf793eb3811e |
children |
line wrap: on
line source
#!/bin/bash # merge a hg branch repo # from https://wiki.mozilla.org/User:Asasaki:Cedar # TODO: inclusion in mercurial utilities package if [[ "$#" != "3" ]] then echo "Usage: hg-merge-branch.sh scheme://hg/repository" exit 1 fi if ! hg root then exit 255 fi # Update to latest # the hg up -C will blow away any local changes! #hg pull #hg up -C -r default # Pull latest branch changes in #hg pull $1 #hg merge #hg commit -m "Merge m-c -> cedar"