Created
April 5, 2013 17:04
-
-
Save mmattax/5320924 to your computer and use it in GitHub Desktop.
Pulling a fork into a named branch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mkdir foo | |
cd foo | |
hg init | |
touch foo.txt | |
hg add | |
hg commit -m "foo.txt" | |
cd .. | |
hg clone foo foo-bar | |
cd foo-bar | |
touch bar.txt | |
hg add | |
hg commit -m "bar.txt" | |
cd ../foo | |
hg branch bar | |
hg commit -m "bar branch" | |
hg up bar | |
hg pull ../foo-bar | |
hg merge -r 2 | |
hg commit -m "merged foo-bar into bar branch" | |
hg up default | |
ls |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment