446
446
dict(actions='modify_file', check='file_has_more_content')),
448
448
dict(actions='delete_file', check='file_doesnt_exist')),),
449
# File renamed-modified/deleted
450
(dict(_base_actions='create_file',
451
_path='new-file', _file_id='file-id'),
452
('file_renamed_and_modified',
453
dict(actions='modify_and_rename_file',
454
check='file_renamed_and_more_content')),
456
dict(actions='delete_file', check='file_doesnt_exist')),),
449
457
# File modified/deleted in dir
450
458
(dict(_base_actions='create_file_in_dir',
451
459
_path='dir/file', _file_id='file-id'),
463
471
def do_modify_file(self):
464
472
return [('modify', ('file-id', 'trunk content\nmore content\n'))]
474
def do_modify_and_rename_file(self):
475
return [('modify', ('file-id', 'trunk content\nmore content\n')),
476
('rename', ('file', 'new-file'))]
466
478
def check_file_has_more_content(self):
467
479
self.assertFileEqual('trunk content\nmore content\n', 'branch/file')
481
def check_file_renamed_and_more_content(self):
482
self.assertFileEqual('trunk content\nmore content\n', 'branch/new-file')
469
484
def do_delete_file(self):
470
485
return [('unversion', 'file-id')]
662
677
('fileb_created',
663
678
dict(actions='create_file_b', check='file_content_b',
664
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'),
683
dict(actions='replace_file_a_by_b', check='file_content_b',
684
path='file', file_id='file-b-id')),
686
dict(actions='modify_file_a', check='file_new_content',
687
path='file', file_id='file-a-id')),),
667
690
def do_nothing(self):
679
702
def check_file_content_b(self):
680
703
self.assertFileEqual('file b content\n', 'branch/file')
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'))]
709
def do_modify_file_a(self):
710
return [('modify', ('file-a-id', 'new content\n'))]
712
def check_file_new_content(self):
713
self.assertFileEqual('new content\n', 'branch/file')
682
715
def _get_resolve_path_arg(self, wt, action):
683
716
return self._this['path']
726
759
self.run_script("""
727
760
$ bzr rm -q dir --force
728
761
$ bzr resolve dir
729
2>2 conflict(s) resolved, 0 remaining
762
2>2 conflicts resolved, 0 remaining
730
763
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
733
766
def test_take_other(self):
734
767
self.run_script("""
735
768
$ bzr resolve dir
736
2>2 conflict(s) resolved, 0 remaining
769
2>2 conflicts resolved, 0 remaining
737
770
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
767
800
def test_keep_them_all(self):
768
801
self.run_script("""
769
802
$ bzr resolve dir
770
2>2 conflict(s) resolved, 0 remaining
803
2>2 conflicts resolved, 0 remaining
771
804
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
776
809
$ bzr mv -q dir/file2 file2
777
810
$ bzr rm -q dir --force
778
811
$ bzr resolve dir
779
2>2 conflict(s) resolved, 0 remaining
812
2>2 conflicts resolved, 0 remaining
780
813
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
831
864
def test_keep_them_all(self):
832
865
self.run_script("""
833
866
$ bzr resolve dir
834
2>2 conflict(s) resolved, 0 remaining
867
2>2 conflicts resolved, 0 remaining
835
868
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
840
873
$ bzr mv -q dir/file2 file2
841
874
$ bzr rm -q dir --force
842
875
$ bzr resolve dir
843
2>2 conflict(s) resolved, 0 remaining
876
2>2 conflicts resolved, 0 remaining
844
877
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
848
881
self.run_script("""
849
882
$ bzr rm -q dir --force
850
883
$ bzr resolve dir
851
2>2 conflict(s) resolved, 0 remaining
884
2>2 conflicts resolved, 0 remaining
852
885
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
855
888
def test_resolve_taking_this(self):
856
889
self.run_script("""
857
890
$ bzr resolve --take-this dir
858
2>2 conflict(s) resolved, 0 remaining
891
2>2 conflicts resolved, 0 remaining
859
892
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
864
897
$ bzr resolve --take-other dir
865
898
2>deleted dir/file2
867
2>2 conflict(s) resolved, 0 remaining
900
2>2 conflicts resolved, 0 remaining
868
901
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
956
989
if self._other['xfail']:
957
990
# It's a bit hackish to raise from here relying on being called for
958
991
# both tests but this avoid overriding test_resolve_taking_other
959
raise tests.KnownFailure(
960
993
"ParentLoop doesn't carry enough info to resolve --take-other")
961
994
_assert_conflict = assertParentLoop
1085
class TestNoFinalPath(script.TestCaseWithTransportAndScript):
1087
def test_bug_805809(self):
1090
Created a standalone tree (format: 2a)
1095
$ bzr commit -m 'create file on trunk'
1096
2>Committing to: .../trunk/
1098
2>Committed revision 1.
1099
# Create a debian branch based on trunk
1101
$ bzr branch trunk -r 1 debian
1102
2>Branched 1 revision.
1109
$ bzr commit -m 'rename file to dir/file for debian'
1110
2>Committing to: .../debian/
1112
2>renamed file => dir/file
1113
2>Committed revision 2.
1114
# Create an experimental branch with a new root-id
1116
$ bzr init experimental
1117
Created a standalone tree (format: 2a)
1119
# Work around merging into empty branch not being supported
1120
# (http://pad.lv/308562)
1121
$ echo something >not-empty
1124
$ bzr commit -m 'Add some content in experimental'
1125
2>Committing to: .../experimental/
1127
2>Committed revision 1.
1128
# merge debian even without a common ancestor
1129
$ bzr merge ../debian -r0..2
1132
2>All changes applied successfully.
1133
$ bzr commit -m 'merging debian into experimental'
1134
2>Committing to: .../experimental/
1137
2>Committed revision 2.
1138
# Create an ubuntu branch with yet another root-id
1141
Created a standalone tree (format: 2a)
1143
# Work around merging into empty branch not being supported
1144
# (http://pad.lv/308562)
1145
$ echo something >not-empty-ubuntu
1147
adding not-empty-ubuntu
1148
$ bzr commit -m 'Add some content in experimental'
1149
2>Committing to: .../ubuntu/
1150
2>added not-empty-ubuntu
1151
2>Committed revision 1.
1153
$ bzr merge ../debian -r0..2
1156
2>All changes applied successfully.
1157
$ bzr commit -m 'merging debian'
1158
2>Committing to: .../ubuntu/
1161
2>Committed revision 2.
1162
# Now try to merge experimental
1163
$ bzr merge ../experimental
1165
2>Path conflict: dir / dir
1166
2>1 conflicts encountered.
1051
1170
class TestResolveActionOption(tests.TestCase):
1053
1172
def setUp(self):