Script started on Sat 31 Oct 2009 02:16:08 AM CET
[01;32mmarienz@siren[00m:[01;34m/tmp[00m$ bzr init mybranch

[/                   ] Build phase 0/2                                                                                         

[#########-          ] Build phase:Apply phase 0/2                                                                             

[############\       ] Build phase:Apply phase:removing file 0/1                                                               

[################|   ] Build phase:Apply phase 2/3                                                                             

                                                                                                                               
Created a standalone tree (format: 2a)
[01;32mmarienz@siren[00m:[01;34m/tmp[00m$ cd mybranch
[01;32mmarienz@siren[00m:[01;34m/tmp/mybranch[00m$ touch foo
[01;32mmarienz@siren[00m:[01;34m/tmp/mybranch[00m$ bzr add
adding foo
[01;32mmarienz@siren[00m:[01;34m/tmp/mybranch[00m$ bzr ci -m'[K 'first revision'

[###/                ] Collecting changes [0] - Stage 1/5                                                                      

                                                                                                                               
Committing to: /tmp/mybranch/
added foo
Committed revision 1.
[01;32mmarienz@siren[00m:[01;34m/tmp/mybranch[00m$ cd ..
[01;32mmarienz@siren[00m:[01;34m/tmp[00m$ bzr branch mybranch ei[Kvilbranch

[/                   ] Finding revisions                                                                                       

[#########-          ] Fetching revisions:Get stream source                                                                    

                                                                                                                               

[\                   ] Build phase 0/2                                                                                         

[|                   ] Build phase:Building tree 0/2                                                                           

[#########/          ] Build phase 1/2                                                                                         

[#########-          ] Build phase:Apply phase 0/2                                                                             

[#########\          ] Build phase:Apply phase:adding file 0/1                                                                 

[############|       ] Build phase:Apply phase 1/3                                                                             

[############/       ] Build phase:Apply phase:removing file 0/1                                                               

[################-   ] Build phase:Apply phase 2/3                                                                             

[################\   ] Build phase:Apply phase:adding file 0/1                                                                 

                                                                                                                               
Branched 1 revision(s).
[01;32mmarienz@siren[00m:[01;34m/tmp[00m$ cd evilbranch
[01;32mmarienz@siren[00m:[01;34m/tmp/evilbranch[00m$ bzr tag 'official-release-y[K[K'
Created tag official-release.
[01;32mmarienz@siren[00m:[01;34m/tmp/evilbranch[00m$ bzr [Ktouch bar
[01;32mmarienz@siren[00m:[01;34m/tmp/evilbranch[00m$ bzr ci -m[K[Kadd
adding bar
[01;32mmarienz@siren[00m:[01;34m/tmp/evilbranch[00m$ bzr ci -m 'Silly revision.'

[###/                ] Collecting changes [0] - Stage 1/5                                                                      

                                                                                                                               
Committing to: /tmp/evilbranch/
added bar
Committed revision 2.
[01;32mmarienz@siren[00m:[01;34m/tmp/evilbranch[00m$ cd ../mybranch/
[01;32mmarienz@siren[00m:[01;34m/tmp/mybranch[00m$ # I' u[K[Km upstream, someone told me to ch[K[Klook into these changeso s[K[K[K, so...[K[K[K:
[01;32mmarienz@siren[00m:[01;34m/tmp/mybranch[00m$ bzr merge ../evilbranch

[/                   ] Finding revisions                                                                                       

[#########-          ] Fetching revisions:Get stream source                                                                    

[\                   ] Merge phase 0/3                                                                                         

[|                   ] Merge phase:Preparing file merge 0/3                                                                    

[######/             ] Merge phase 1/3                                                                                         

[######-             ] Merge phase:Resolution pass 1/10                                                                        

                                                                                                                               
+N  bar

[############\       ] Merge phase 2/3                                                                                         

[############|       ] Merge phase:Apply phase 0/2                                                                             

[############/       ] Merge phase:Apply phase:adding file 0/1                                                                 

[###############-    ] Merge phase:Apply phase 1/3                                                                             

[###############\    ] Merge phase:Apply phase:removing file 0/2                                                               

[#################|  ] Merge phase:Apply phase 2/3                                                                             

[#################/  ] Merge phase:Apply phase:adding file 0/1                                                                 

                                                                                                                               
All changes applied successfully.
[01;32mmarienz@siren[00m:[01;34m/tmp/mybranch[00m$ bzbr[K[Kr st
added:
  bar
pending merge tips: (use -v to see all merge revisions)
  Marien Zwart 2009-10-31 Silly revision.
[01;32mmarienz@siren[00m:[01;34m/tmp/mybranch[00m$ # Hmm, that [KI don't actually want that, so r[K[K:
[01;32mmarienz@siren[00m:[01;34m/tmp/mybranch[00m$ bzr revert

[/                   ] Revert phase 0/3                                                                                        

[##-                 ] Revert phase:comparing files 2/5                                                                        

[######\             ] Revert phase 1/3                                                                                        

[######|             ] Revert phase:Resolution pass 1/10                                                                       

                                                                                                                               
-D  bar

[############/       ] Revert phase 2/3                                                                                        

[############-       ] Revert phase:Apply phase 0/2                                                                            

[############\       ] Revert phase:Apply phase:removing file 0/1                                                              

[###############|    ] Revert phase:Apply phase 1/3                                                                            

[###############/    ] Revert phase:Apply phase:removing file 0/3                                                              

[#################-  ] Revert phase:Apply phase 2/3                                                                            

                                                                                                                               
[01;32mmarienz@siren[00m:[01;34m/tmp/mybranch[00m$ # Normally that undid everything "merge" did, but:
[01;32mmarienz@siren[00m:[01;34m/tmp/mybranch[00m$ bzr tags
official-release     1
[01;32mmarienz@siren[00m:[01;34m/tmp/mybranch[00m$ # and if I were to push this branch anywhere that'd spread out that tag, with no way of telling I d 
id not set it, the owner of evilbranch did ([K[K.
[01;32mmarienz@siren[00m:[01;34m/tmp/mybranch[00m$ exit
exit

Script done on Sat 31 Oct 2009 02:18:34 AM CET