Mercurial > hg > config

view bin/hg-merge-branch.sh @ 767:35f8751c0930

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
it is very annoying to have ones overrides overridden; see also http://stackoverflow.com/questions/25381304/why-type-cd-on-mac-os-states-that-cd-is-a-function
author Jeff Hammel <k0scist@gmail.com>
date Thu, 28 Jan 2016 14:02:17 -0800
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"