Created
March 3, 2009 22:57
-
-
Save phinze/73600 to your computer and use it in GitHub Desktop.
This file contains hidden or 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
$ bzr init-repo --rich-root-pack uiris3 | |
$ cd uiris3 | |
$ bzr checkout bzr+ssh://dev/uiris3/trunk trunk.bound | |
$ bzr branch trunk.bound mycoolfeature | |
$ cd mycoolfeature | |
# ... hack hack hack (meanwhile Bob commits 124 and Alice commits 125 to shared trunk branch) | |
$ bzr commit -m "First local checkpoint" | |
Committed revision 124 | |
# ... hack hack hack (meanwhile Bob commits 126 and 127 to shared trunk branch) | |
$ bzr commit -m "Second local checkpoint" | |
Committed revision 125 | |
# ... hack hack finish (meanwhile Alice commits 128 to shared trunk branch) | |
$ bzr commit -m "Finishing up, ready to merge" | |
Committed revision 126 | |
$ cd ../trunk.bound | |
$ bzr merge ../mycoolfeature | |
$ bzr ci -m "Adding My Cool Feature" | |
ERROR: Bound branch is out of date with master branch | |
To commit to master branch, run update and then commit. | |
# "Oh, okay." | |
$ bzr log bzr+ssh://dev/uiris3/trunk -r 124.. --line | |
124: 2009-03-03 Bob: Getting Bar feature done | |
125: 2009-03-04 Alice: Adding Foo Feature | |
.... | |
128: 2009-03-04 Bob: Fixing Baz Bug | |
$ bzr up | |
M foo/bar | |
M bar | |
... | |
Updated to revision 128 | |
$ bzr ci -m "Adding My Cool Feature" | |
Committed revision 129 | |
$ bzr log bzr+ssh://dev/uiris3/trunk -r 124.. --line | |
124: 2009-03-03 Bob Getting Bar feature done | |
125: 2009-03-04 Alice Adding Foo Feature | |
.... | |
128: 2009-03-04 Bob Fixing Baz Bug | |
129: 2009-03-04 Harry Adding My Cool Feature |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment