view bin/hg-merge-branch.sh @ 631:d87a17e1abac

-> http://k0s.org/hg/TextShaper/rev/e6f680d25d63
author Jeff Hammel <k0scist@gmail.com>
date Sun, 23 Feb 2014 00:49:18 -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"