← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-01 19:18:09 UTC
  • mfrom: (6459 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6460.
  • Revision ID: jelmer@samba.org-20120201191809-xn340a5i5v4fqsfu
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
759
759
        self.run_script("""
760
760
$ bzr rm -q dir  --force
761
761
$ bzr resolve dir
762
 
2>2 conflict(s) resolved, 0 remaining
 
762
2>2 conflicts resolved, 0 remaining
763
763
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
764
764
""")
765
765
 
766
766
    def test_take_other(self):
767
767
        self.run_script("""
768
768
$ bzr resolve dir
769
 
2>2 conflict(s) resolved, 0 remaining
 
769
2>2 conflicts resolved, 0 remaining
770
770
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
771
771
""")
772
772
 
800
800
    def test_keep_them_all(self):
801
801
        self.run_script("""
802
802
$ bzr resolve dir
803
 
2>2 conflict(s) resolved, 0 remaining
 
803
2>2 conflicts resolved, 0 remaining
804
804
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
805
805
""")
806
806
 
809
809
$ bzr mv -q dir/file2 file2
810
810
$ bzr rm -q dir --force
811
811
$ bzr resolve dir
812
 
2>2 conflict(s) resolved, 0 remaining
 
812
2>2 conflicts resolved, 0 remaining
813
813
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
814
814
""")
815
815
 
817
817
        self.run_script("""
818
818
$ bzr rm -q dir --force
819
819
$ bzr resolve dir
820
 
2>2 conflict(s) resolved, 0 remaining
 
820
2>2 conflicts resolved, 0 remaining
821
821
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
822
822
""")
823
823
 
864
864
    def test_keep_them_all(self):
865
865
        self.run_script("""
866
866
$ bzr resolve dir
867
 
2>2 conflict(s) resolved, 0 remaining
 
867
2>2 conflicts resolved, 0 remaining
868
868
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
869
869
""")
870
870
 
873
873
$ bzr mv -q dir/file2 file2
874
874
$ bzr rm -q dir --force
875
875
$ bzr resolve dir
876
 
2>2 conflict(s) resolved, 0 remaining
 
876
2>2 conflicts resolved, 0 remaining
877
877
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
878
878
""")
879
879
 
881
881
        self.run_script("""
882
882
$ bzr rm -q dir --force
883
883
$ bzr resolve dir
884
 
2>2 conflict(s) resolved, 0 remaining
 
884
2>2 conflicts resolved, 0 remaining
885
885
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
886
886
""")
887
887
 
888
888
    def test_resolve_taking_this(self):
889
889
        self.run_script("""
890
890
$ bzr resolve --take-this dir
891
 
2>2 conflict(s) resolved, 0 remaining
 
891
2>2 conflicts resolved, 0 remaining
892
892
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
893
893
""")
894
894
 
897
897
$ bzr resolve --take-other dir
898
898
2>deleted dir/file2
899
899
2>deleted dir
900
 
2>2 conflict(s) resolved, 0 remaining
 
900
2>2 conflicts resolved, 0 remaining
901
901
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
902
902
""")
903
903
 
989
989
        if self._other['xfail']:
990
990
            # It's a bit hackish to raise from here relying on being called for
991
991
            # both tests but this avoid overriding test_resolve_taking_other
992
 
            raise tests.KnownFailure(
 
992
            self.knownFailure(
993
993
                "ParentLoop doesn't carry enough info to resolve --take-other")
994
994
    _assert_conflict = assertParentLoop
995
995
 
1027
1027
# aside ? -- vila 090916
1028
1028
$ bzr add -q foo
1029
1029
$ bzr resolve foo.new
1030
 
2>1 conflict(s) resolved, 0 remaining
 
1030
2>1 conflict resolved, 0 remaining
1031
1031
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
1032
1032
""")
1033
1033
 
1036
1036
$ bzr rm -q foo --force
1037
1037
$ bzr mv -q foo.new foo
1038
1038
$ bzr resolve foo
1039
 
2>1 conflict(s) resolved, 0 remaining
 
1039
2>1 conflict resolved, 0 remaining
1040
1040
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
1041
1041
""")
1042
1042
 
1099
1099
# Create a debian branch based on trunk
1100
1100
$ cd ..
1101
1101
$ bzr branch trunk -r 1 debian
1102
 
2>Branched 1 revision(s).
 
1102
2>Branched 1 revision.
1103
1103
$ cd debian
1104
1104
$ mkdir dir
1105
1105
$ bzr add