Mercurial > hg > config

view bin/hg-merge-branch.sh @ 369:11cf7018ebff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new crappy package for helping me with http://k0s.org/portfolio/python/python-tools.txt
author Jeff Hammel <jhammel@mozilla.com>
date Sun, 21 Jul 2013 05:27:28 -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"