/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 
19
19
import os
20
20
 
21
 
from bzrlib import uncommit
22
 
from bzrlib.bzrdir import BzrDirMetaFormat1
23
 
from bzrlib.errors import BoundBranchOutOfDate
24
 
from bzrlib.tests import TestCaseWithTransport
25
 
from bzrlib.tests.matchers import ContainsNoVfsCalls
26
 
from bzrlib.tests.script import (
 
21
from breezy import uncommit
 
22
from breezy.bzrdir import BzrDirMetaFormat1
 
23
from breezy.errors import BoundBranchOutOfDate
 
24
from breezy.tests import TestCaseWithTransport
 
25
from breezy.tests.matchers import ContainsNoVfsCalls
 
26
from breezy.tests.script import (
27
27
    run_script,
28
28
    ScriptRunner,
29
29
    )
70
70
        wt = self.create_simple_tree()
71
71
        os.chdir('tree')
72
72
        run_script(self, """    
73
 
        $ bzr uncommit
 
73
        $ brz uncommit
74
74
        ...
75
75
        The above revision(s) will be removed.
76
76
        2>Uncommit these revisions? ([y]es, [n]o): no
238
238
        script = ScriptRunner()
239
239
        script.run_script(self, """
240
240
$ cd tree
241
 
$ bzr uncommit --force 
 
241
$ brz uncommit --force 
242
242
    2 ...
243
243
      second commit
244
244
...
245
245
The above revision(s) will be removed.
246
246
You can restore the old tip by running:
247
 
  bzr pull . -r revid:a2
 
247
  brz pull . -r revid:a2
248
248
""")
249
249
 
250
250
    def test_uncommit_octopus_merge(self):
319
319
class TestInconsistentDelta(TestCaseWithTransport):
320
320
    # See https://bugs.launchpad.net/bzr/+bug/855155
321
321
    # See https://bugs.launchpad.net/bzr/+bug/1100385
322
 
    # bzr uncommit may result in error
 
322
    # brz uncommit may result in error
323
323
    # 'An inconsistent delta was supplied involving'
324
324
 
325
325
    def test_inconsistent_delta(self):