Skip to content

Instantly share code, notes, and snippets.

@f440
Created April 5, 2011 08:40
Show Gist options
  • Save f440/903255 to your computer and use it in GitHub Desktop.
Save f440/903255 to your computer and use it in GitHub Desktop.
#!/bin/sh
set -x
rm -rf sample sample_copy
hg clone https://bitbucket.org/f440/sample remote
hg clone remote local
cd local
branch='tmp'
hg branch $branch
hg ci -m "create $branch"
date >> 0 # edit
hg ci -m "edit at $branch"
hg update default
hg merge $branch
hg ci -m "merge $branch"
cd ../remote
date >> 1 # edit
hg ci -m 'edit at remote branch'
cd -
hg pull --rebase
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment