/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2019-06-03 03:10:29 UTC
  • mfrom: (7312 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190603031029-b34je03bjulxxdwj
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_uncommit.py
246
246
  brz pull . -r revid:a2
247
247
""")
248
248
 
 
249
    def test_uncommit_shows_pull_with_location(self):
 
250
        wt = self.create_simple_tree()
 
251
 
 
252
        script = ScriptRunner()
 
253
        script.run_script(self, """
 
254
$ brz uncommit --force tree
 
255
    2 ...
 
256
      second commit
 
257
...
 
258
The above revision(s) will be removed.
 
259
You can restore the old tip by running:
 
260
  brz pull -d tree tree -r revid:a2
 
261
""")
 
262
 
249
263
    def test_uncommit_octopus_merge(self):
250
264
        # Check that uncommit keeps the pending merges in the same order
251
265
        # though it will also filter out ones in the ancestry