← 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-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
677
677
             ('fileb_created',
678
678
              dict(actions='create_file_b', check='file_content_b',
679
679
                   path='file', file_id='file-b-id')),),
 
680
            # File created with different file-ids but deleted on one side
 
681
            (dict(_base_actions='create_file_a'),
 
682
             ('filea_replaced',
 
683
              dict(actions='replace_file_a_by_b', check='file_content_b',
 
684
                   path='file', file_id='file-b-id')),
 
685
             ('filea_modified',
 
686
              dict(actions='modify_file_a', check='file_new_content',
 
687
                   path='file', file_id='file-a-id')),),
680
688
            ])
681
689
 
682
690
    def do_nothing(self):
694
702
    def check_file_content_b(self):
695
703
        self.assertFileEqual('file b content\n', 'branch/file')
696
704
 
 
705
    def do_replace_file_a_by_b(self):
 
706
        return [('unversion', 'file-a-id'),
 
707
                ('add', ('file', 'file-b-id', 'file', 'file b content\n'))]
 
708
 
 
709
    def do_modify_file_a(self):
 
710
        return [('modify', ('file-a-id', 'new content\n'))]
 
711
 
 
712
    def check_file_new_content(self):
 
713
        self.assertFileEqual('new content\n', 'branch/file')
 
714
 
697
715
    def _get_resolve_path_arg(self, wt, action):
698
716
        return self._this['path']
699
717
 
741
759
        self.run_script("""
742
760
$ bzr rm -q dir  --force
743
761
$ bzr resolve dir
744
 
2>2 conflict(s) resolved, 0 remaining
 
762
2>2 conflicts resolved, 0 remaining
745
763
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
746
764
""")
747
765
 
748
766
    def test_take_other(self):
749
767
        self.run_script("""
750
768
$ bzr resolve dir
751
 
2>2 conflict(s) resolved, 0 remaining
 
769
2>2 conflicts resolved, 0 remaining
752
770
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
753
771
""")
754
772
 
782
800
    def test_keep_them_all(self):
783
801
        self.run_script("""
784
802
$ bzr resolve dir
785
 
2>2 conflict(s) resolved, 0 remaining
 
803
2>2 conflicts resolved, 0 remaining
786
804
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
787
805
""")
788
806
 
791
809
$ bzr mv -q dir/file2 file2
792
810
$ bzr rm -q dir --force
793
811
$ bzr resolve dir
794
 
2>2 conflict(s) resolved, 0 remaining
 
812
2>2 conflicts resolved, 0 remaining
795
813
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
796
814
""")
797
815
 
799
817
        self.run_script("""
800
818
$ bzr rm -q dir --force
801
819
$ bzr resolve dir
802
 
2>2 conflict(s) resolved, 0 remaining
 
820
2>2 conflicts resolved, 0 remaining
803
821
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
804
822
""")
805
823
 
846
864
    def test_keep_them_all(self):
847
865
        self.run_script("""
848
866
$ bzr resolve dir
849
 
2>2 conflict(s) resolved, 0 remaining
 
867
2>2 conflicts resolved, 0 remaining
850
868
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
851
869
""")
852
870
 
855
873
$ bzr mv -q dir/file2 file2
856
874
$ bzr rm -q dir --force
857
875
$ bzr resolve dir
858
 
2>2 conflict(s) resolved, 0 remaining
 
876
2>2 conflicts resolved, 0 remaining
859
877
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
860
878
""")
861
879
 
863
881
        self.run_script("""
864
882
$ bzr rm -q dir --force
865
883
$ bzr resolve dir
866
 
2>2 conflict(s) resolved, 0 remaining
 
884
2>2 conflicts resolved, 0 remaining
867
885
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
868
886
""")
869
887
 
870
888
    def test_resolve_taking_this(self):
871
889
        self.run_script("""
872
890
$ bzr resolve --take-this dir
873
 
2>2 conflict(s) resolved, 0 remaining
 
891
2>2 conflicts resolved, 0 remaining
874
892
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
875
893
""")
876
894
 
879
897
$ bzr resolve --take-other dir
880
898
2>deleted dir/file2
881
899
2>deleted dir
882
 
2>2 conflict(s) resolved, 0 remaining
 
900
2>2 conflicts resolved, 0 remaining
883
901
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
884
902
""")
885
903
 
1009
1027
# aside ? -- vila 090916
1010
1028
$ bzr add -q foo
1011
1029
$ bzr resolve foo.new
1012
 
2>1 conflict(s) resolved, 0 remaining
 
1030
2>1 conflict resolved, 0 remaining
1013
1031
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
1014
1032
""")
1015
1033
 
1018
1036
$ bzr rm -q foo --force
1019
1037
$ bzr mv -q foo.new foo
1020
1038
$ bzr resolve foo
1021
 
2>1 conflict(s) resolved, 0 remaining
 
1039
2>1 conflict resolved, 0 remaining
1022
1040
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
1023
1041
""")
1024
1042
 
1043
1061
        # This is nearly like TestResolveNonDirectoryParent but with branch and
1044
1062
        # trunk switched. As such it should certainly produce the same
1045
1063
        # conflict.
1046
 
        self.run_script("""
 
1064
        self.assertRaises(errors.MalformedTransform,
 
1065
                          self.run_script,"""
1047
1066
$ bzr init trunk
1048
1067
...
1049
1068
$ cd trunk
1080
1099
# Create a debian branch based on trunk
1081
1100
$ cd ..
1082
1101
$ bzr branch trunk -r 1 debian
1083
 
2>Branched 1 revision(s).
 
1102
2>Branched 1 revision.
1084
1103
$ cd debian
1085
1104
$ mkdir dir
1086
1105
$ bzr add