Created
December 18, 2009 19:30
-
-
Save kapilt/259699 to your computer and use it in GitHub Desktop.
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
#!/bin/bash | |
rm -rf a b | |
mkdir a | |
# do some work | |
cd a | |
bzr init | |
# make a branch | |
cd .. | |
bzr branch a b | |
# trunk gets a new revision | |
cd a | |
echo "Foo" > foo.txt | |
bzr add foo.txt | |
bzr commit -m "Added foo" | |
# switch to branch | |
cd ../b | |
# try a merge | |
bzr merge ../a | |
# don't really like it, revert | |
bzr revert . | |
# try it again.. boom | |
bzr merge ../a |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment