Mercurial > hg > config
view bin/hg-merge-branch.sh @ 803:70e9f82c2443
* prime actually doesnt work; if i had a decent CI for my own software, i would have known that; but i dont
* resource_filename.py even _says_ example in it. let us hope it is telling the truth
author | Jeff Hammel <k0scist@gmail.com> |
---|---|
date | Fri, 28 Oct 2016 17:00:37 -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"