← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

Implement --interactive for ParentLoop.

* bzrlib/tests/test_conflicts.py:
(TestResolveParentLoop): Tests for --interactive.

* bzrlib/conflicts.py:
(ParentLoop): Add actions for --interactive. Presumably the
conflcit itself should have more info about the involved paths.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
543
543
2>1 conflicts encountered.
544
544
"""
545
545
 
546
 
    def test_keep_target(self):
 
546
    def test_keep_mine(self):
547
547
        self.run_script("""
548
548
$ bzr resolve dir2
549
549
$ bzr commit --strict -m 'No more conflicts nor unknown files'
550
550
""")
551
551
 
552
 
    def test_keep_source(self):
 
552
    def test_take_theirs(self):
553
553
        self.run_script("""
554
554
$ bzr mv dir2/dir1 dir1
555
555
$ bzr mv dir2 dir1
557
557
$ bzr commit --strict -m 'No more conflicts nor unknown files'
558
558
""")
559
559
 
 
560
    def test_resolve_keeping_mine(self):
 
561
        self.run_script("""
 
562
$ bzr resolve --interactive dir2
 
563
<keep_mine
 
564
$ bzr commit --strict -m 'No more conflicts nor unknown files'
 
565
""")
 
566
 
 
567
    def test_resolve_taking_theirs(self):
 
568
        self.run_script("""
 
569
$ bzr resolve --interactive dir2
 
570
<take_theirs
 
571
$ bzr commit --strict -m 'No more conflicts nor unknown files'
 
572
""")
 
573
 
560
574
 
561
575
class TestResolveNonDirectoryParent(TestResolveConflicts):
562
576