← 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: Jonathan Riddell
  • Date: 2011-09-16 11:13:47 UTC
  • mto: This revision was merged to the branch mainline in revision 6144.
  • Revision ID: jriddell@canonical.com-20110916111347-fyjk426bkl0jrbfu
gettext() show_warning usage

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_conflicts.py
741
741
        self.run_script("""
742
742
$ bzr rm -q dir  --force
743
743
$ bzr resolve dir
744
 
2>2 conflict(s) resolved, 0 remaining
 
744
2>2 conflicts resolved, 0 remaining
745
745
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
746
746
""")
747
747
 
748
748
    def test_take_other(self):
749
749
        self.run_script("""
750
750
$ bzr resolve dir
751
 
2>2 conflict(s) resolved, 0 remaining
 
751
2>2 conflicts resolved, 0 remaining
752
752
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
753
753
""")
754
754
 
782
782
    def test_keep_them_all(self):
783
783
        self.run_script("""
784
784
$ bzr resolve dir
785
 
2>2 conflict(s) resolved, 0 remaining
 
785
2>2 conflicts resolved, 0 remaining
786
786
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
787
787
""")
788
788
 
791
791
$ bzr mv -q dir/file2 file2
792
792
$ bzr rm -q dir --force
793
793
$ bzr resolve dir
794
 
2>2 conflict(s) resolved, 0 remaining
 
794
2>2 conflicts resolved, 0 remaining
795
795
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
796
796
""")
797
797
 
799
799
        self.run_script("""
800
800
$ bzr rm -q dir --force
801
801
$ bzr resolve dir
802
 
2>2 conflict(s) resolved, 0 remaining
 
802
2>2 conflicts resolved, 0 remaining
803
803
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
804
804
""")
805
805
 
846
846
    def test_keep_them_all(self):
847
847
        self.run_script("""
848
848
$ bzr resolve dir
849
 
2>2 conflict(s) resolved, 0 remaining
 
849
2>2 conflicts resolved, 0 remaining
850
850
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
851
851
""")
852
852
 
855
855
$ bzr mv -q dir/file2 file2
856
856
$ bzr rm -q dir --force
857
857
$ bzr resolve dir
858
 
2>2 conflict(s) resolved, 0 remaining
 
858
2>2 conflicts resolved, 0 remaining
859
859
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
860
860
""")
861
861
 
863
863
        self.run_script("""
864
864
$ bzr rm -q dir --force
865
865
$ bzr resolve dir
866
 
2>2 conflict(s) resolved, 0 remaining
 
866
2>2 conflicts resolved, 0 remaining
867
867
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
868
868
""")
869
869
 
870
870
    def test_resolve_taking_this(self):
871
871
        self.run_script("""
872
872
$ bzr resolve --take-this dir
873
 
2>2 conflict(s) resolved, 0 remaining
 
873
2>2 conflicts resolved, 0 remaining
874
874
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
875
875
""")
876
876
 
879
879
$ bzr resolve --take-other dir
880
880
2>deleted dir/file2
881
881
2>deleted dir
882
 
2>2 conflict(s) resolved, 0 remaining
 
882
2>2 conflicts resolved, 0 remaining
883
883
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
884
884
""")
885
885
 
1009
1009
# aside ? -- vila 090916
1010
1010
$ bzr add -q foo
1011
1011
$ bzr resolve foo.new
1012
 
2>1 conflict(s) resolved, 0 remaining
 
1012
2>1 conflict resolved, 0 remaining
1013
1013
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
1014
1014
""")
1015
1015
 
1018
1018
$ bzr rm -q foo --force
1019
1019
$ bzr mv -q foo.new foo
1020
1020
$ bzr resolve foo
1021
 
2>1 conflict(s) resolved, 0 remaining
 
1021
2>1 conflict resolved, 0 remaining
1022
1022
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
1023
1023
""")
1024
1024