Mercurial > hg > config

comparison bin/hg-merge-branch.sh @ 318:cf793eb3811e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
from https://wiki.mozilla.org/User:Asasaki:Cedar
author Jeff Hammel <jhammel@mozilla.com>
date Wed, 05 Jun 2013 15:33:07 -0700
parents
children
comparison
equal deleted inserted replaced
317:eb9d0776226f 318:cf793eb3811e
1 #!/bin/bash
2
3 # merge a hg branch repo
4 # from https://wiki.mozilla.org/User:Asasaki:Cedar
5 # TODO: inclusion in mercurial utilities package
6
7 if [[ "$#" != "3" ]]
8 then
9 echo "Usage: hg-merge-branch.sh scheme://hg/repository"
10 exit 1
11 fi
12
13 if ! hg root
14 then
15 exit 255
16 fi
17
18 # Update to latest
19 # the hg up -C will blow away any local changes!
20 #hg pull
21 #hg up -C -r default
22
23 # Pull latest branch changes in
24 #hg pull $1
25 #hg merge
26 #hg commit -m "Merge m-c -> cedar"