~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_uncommit.py

  • Committer: John Arbash Meinel
  • Date: 2010-09-29 20:18:37 UTC
  • mfrom: (5450 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5452.
  • Revision ID: john@arbash-meinel.com-20100929201837-6d9jhvjokfe3ubvk
Merge bzr.dev 5450 to resolve NEWS and criss-cross merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
70
70
        os.chdir('tree')
71
71
        run_script(self, """    
72
72
        $ bzr uncommit
73
 
            2 jrandom@example.com\t...
74
 
              second commit
75
 
        
 
73
        ...
76
74
        The above revision(s) will be removed.
77
75
        2>Uncommit these revisions? [y/n]: 
78
76
        <n