20
20
from bzrlib import (
29
from bzrlib.tests import script
32
def load_tests(standard_tests, module, loader):
33
result = loader.suiteClass()
35
sp_tests, remaining_tests = tests.split_suite_by_condition(
36
standard_tests, tests.condition_isinstance((
37
TestParametrizedResolveConflicts,
39
# Each test class defines its own scenarios. This is needed for
40
# TestResolvePathConflictBefore531967 that verifies that the same tests as
41
# TestResolvePathConflict still pass.
42
for test in tests.iter_suite_tests(sp_tests):
43
tests.apply_scenarios(test, test.scenarios(), result)
45
# No parametrization for the remaining tests
46
result.addTests(remaining_tests)
28
from bzrlib.tests import (
34
load_tests = scenarios.load_tests_apply_scenarios
51
37
# TODO: Test commit with some added, and added-but-missing files
65
def vary_by_conflicts():
66
for conflict in example_conflicts:
67
yield (conflict.__class__.__name__, {"conflict": conflict})
79
70
class TestConflicts(tests.TestCaseWithTransport):
81
def test_conflicts(self):
82
"""Conflicts are detected properly"""
83
# Use BzrDirFormat6 so we can fake conflicts
84
tree = self.make_branch_and_tree('.', format=bzrdir.BzrDirFormat6())
85
self.build_tree_contents([('hello', 'hello world4'),
86
('hello.THIS', 'hello world2'),
87
('hello.BASE', 'hello world1'),
88
('hello.OTHER', 'hello world3'),
89
('hello.sploo.BASE', 'yellowworld'),
90
('hello.sploo.OTHER', 'yellowworld2'),
93
self.assertLength(6, list(tree.list_files()))
95
tree_conflicts = tree.conflicts()
96
self.assertLength(2, tree_conflicts)
97
self.assertTrue('hello' in tree_conflicts[0].path)
98
self.assertTrue('hello.sploo' in tree_conflicts[1].path)
99
conflicts.restore('hello')
100
conflicts.restore('hello.sploo')
101
self.assertLength(0, tree.conflicts())
102
self.assertFileEqual('hello world2', 'hello')
103
self.assertFalse(os.path.lexists('hello.sploo'))
104
self.assertRaises(errors.NotConflicted, conflicts.restore, 'hello')
105
self.assertRaises(errors.NotConflicted,
106
conflicts.restore, 'hello.sploo')
108
72
def test_resolve_conflict_dir(self):
109
73
tree = self.make_branch_and_tree('.')
110
74
self.build_tree_contents([('hello', 'hello world4'),
161
125
self.assertEqual(conflicts.ConflictList([]), tree.conflicts())
164
class TestConflictStanzas(tests.TestCase):
128
class TestPerConflict(tests.TestCase):
130
scenarios = scenarios.multiply_scenarios(vary_by_conflicts())
132
def test_stringification(self):
133
text = unicode(self.conflict)
134
self.assertContainsString(text, self.conflict.path)
135
self.assertContainsString(text.lower(), "conflict")
136
self.assertContainsString(repr(self.conflict),
137
self.conflict.__class__.__name__)
166
139
def test_stanza_roundtrip(self):
167
# write and read our example stanza.
168
stanza_iter = example_conflicts.to_stanzas()
169
processed = conflicts.ConflictList.from_stanzas(stanza_iter)
170
for o, p in zip(processed, example_conflicts):
171
self.assertEqual(o, p)
173
self.assertIsInstance(o.path, unicode)
175
if o.file_id is not None:
176
self.assertIsInstance(o.file_id, str)
178
conflict_path = getattr(o, 'conflict_path', None)
179
if conflict_path is not None:
180
self.assertIsInstance(conflict_path, unicode)
182
conflict_file_id = getattr(o, 'conflict_file_id', None)
183
if conflict_file_id is not None:
184
self.assertIsInstance(conflict_file_id, str)
141
o = conflicts.Conflict.factory(**p.as_stanza().as_dict())
142
self.assertEqual(o, p)
144
self.assertIsInstance(o.path, unicode)
146
if o.file_id is not None:
147
self.assertIsInstance(o.file_id, str)
149
conflict_path = getattr(o, 'conflict_path', None)
150
if conflict_path is not None:
151
self.assertIsInstance(conflict_path, unicode)
153
conflict_file_id = getattr(o, 'conflict_file_id', None)
154
if conflict_file_id is not None:
155
self.assertIsInstance(conflict_file_id, str)
186
157
def test_stanzification(self):
187
for stanza in example_conflicts.to_stanzas():
188
if 'file_id' in stanza:
189
# In Stanza form, the file_id has to be unicode.
190
self.assertStartsWith(stanza['file_id'], u'\xeed')
191
self.assertStartsWith(stanza['path'], u'p\xe5th')
192
if 'conflict_path' in stanza:
193
self.assertStartsWith(stanza['conflict_path'], u'p\xe5th')
194
if 'conflict_file_id' in stanza:
195
self.assertStartsWith(stanza['conflict_file_id'], u'\xeed')
158
stanza = self.conflict.as_stanza()
159
if 'file_id' in stanza:
160
# In Stanza form, the file_id has to be unicode.
161
self.assertStartsWith(stanza['file_id'], u'\xeed')
162
self.assertStartsWith(stanza['path'], u'p\xe5th')
163
if 'conflict_path' in stanza:
164
self.assertStartsWith(stanza['conflict_path'], u'p\xe5th')
165
if 'conflict_file_id' in stanza:
166
self.assertStartsWith(stanza['conflict_file_id'], u'\xeed')
169
class TestConflictList(tests.TestCase):
171
def test_stanzas_roundtrip(self):
172
stanzas_iter = example_conflicts.to_stanzas()
173
processed = conflicts.ConflictList.from_stanzas(stanzas_iter)
174
self.assertEqual(example_conflicts, processed)
176
def test_stringification(self):
177
for text, o in zip(example_conflicts.to_strings(), example_conflicts):
178
self.assertEqual(text, unicode(o))
198
181
# FIXME: The shell-like tests should be converted to real whitebox tests... or
298
"""Return the scenario list for the conflict type defined by the class.
300
Each scenario is of the form:
301
(common, (left_name, left_dict), (right_name, right_dict))
305
* left_name and right_name are the scenario names that will be combined
307
* left_dict and right_dict are the attributes specific to each half of
308
the scenario. They should include at least 'actions' and 'check' and
309
will be available as '_this' and '_other' test instance attributes.
311
Daughters classes are free to add their specific attributes as they see
312
fit in any of the three dicts.
314
This is a class method so that load_tests can find it.
316
'_base_actions' in the common dict, 'actions' and 'check' in the left
317
and right dicts use names that map to methods in the test classes. Some
318
prefixes are added to these names to get the correspong methods (see
319
_get_actions() and _get_check()). The motivation here is to avoid
320
collisions in the class namespace.
322
# Only concrete classes return actual scenarios
275
"""The scenario list for the conflict type defined by the class.
277
Each scenario is of the form:
278
(common, (left_name, left_dict), (right_name, right_dict))
282
* left_name and right_name are the scenario names that will be combined
284
* left_dict and right_dict are the attributes specific to each half of
285
the scenario. They should include at least 'actions' and 'check' and
286
will be available as '_this' and '_other' test instance attributes.
288
Daughters classes are free to add their specific attributes as they see
289
fit in any of the three dicts.
291
This is a class method so that load_tests can find it.
293
'_base_actions' in the common dict, 'actions' and 'check' in the left
294
and right dicts use names that map to methods in the test classes. Some
295
prefixes are added to these names to get the correspong methods (see
296
_get_actions() and _get_check()). The motivation here is to avoid
297
collisions in the class namespace.
326
301
super(TestParametrizedResolveConflicts, self).setUp()
366
class TestResolveTextConflicts(TestParametrizedResolveConflicts):
368
_conflict_type = conflicts.TextConflict
370
# Set by the scenarios
371
# path and file-id for the file involved in the conflict
375
scenarios = mirror_scenarios(
377
# File modified on both sides
378
(dict(_base_actions='create_file',
379
_path='file', _file_id='file-id'),
381
dict(actions='modify_file_A', check='file_has_content_A')),
383
dict(actions='modify_file_B', check='file_has_content_B')),),
384
# File modified on both sides in dir
385
(dict(_base_actions='create_file_in_dir',
386
_path='dir/file', _file_id='file-id'),
387
('filed_modified_A_in_dir',
388
dict(actions='modify_file_A',
389
check='file_in_dir_has_content_A')),
391
dict(actions='modify_file_B',
392
check='file_in_dir_has_content_B')),),
395
def do_create_file(self, path='file'):
396
return [('add', (path, 'file-id', 'file', 'trunk content\n'))]
398
def do_modify_file_A(self):
399
return [('modify', ('file-id', 'trunk content\nfeature A\n'))]
401
def do_modify_file_B(self):
402
return [('modify', ('file-id', 'trunk content\nfeature B\n'))]
404
def check_file_has_content_A(self, path='file'):
405
self.assertFileEqual('trunk content\nfeature A\n',
406
osutils.pathjoin('branch', path))
408
def check_file_has_content_B(self, path='file'):
409
self.assertFileEqual('trunk content\nfeature B\n',
410
osutils.pathjoin('branch', path))
412
def do_create_file_in_dir(self):
413
return [('add', ('dir', 'dir-id', 'directory', '')),
414
] + self.do_create_file('dir/file')
416
def check_file_in_dir_has_content_A(self):
417
self.check_file_has_content_A('dir/file')
419
def check_file_in_dir_has_content_B(self):
420
self.check_file_has_content_B('dir/file')
422
def _get_resolve_path_arg(self, wt, action):
425
def assertTextConflict(self, wt, c):
426
self.assertEqual(self._file_id, c.file_id)
427
self.assertEqual(self._path, c.path)
428
_assert_conflict = assertTextConflict
391
431
class TestResolveContentsConflict(TestParametrizedResolveConflicts):
393
_conflict_type = conflicts.ContentsConflict,
433
_conflict_type = conflicts.ContentsConflict
395
# Set by load_tests from scenarios()
435
# Set by the scenarios
396
436
# path and file-id for the file involved in the conflict
440
scenarios = mirror_scenarios(
403
442
# File modified/deleted
404
443
(dict(_base_actions='create_file',
405
444
_path='file', _file_id='file-id'),
407
446
dict(actions='modify_file', check='file_has_more_content')),
409
448
dict(actions='delete_file', check='file_doesnt_exist')),),
411
return mirror_scenarios(base_scenarios)
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')),),
457
# File modified/deleted in dir
458
(dict(_base_actions='create_file_in_dir',
459
_path='dir/file', _file_id='file-id'),
460
('file_modified_in_dir',
461
dict(actions='modify_file_in_dir',
462
check='file_in_dir_has_more_content')),
463
('file_deleted_in_dir',
464
dict(actions='delete_file',
465
check='file_in_dir_doesnt_exist')),),
413
468
def do_create_file(self):
414
469
return [('add', ('file', 'file-id', 'file', 'trunk content\n'))]
416
471
def do_modify_file(self):
417
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'))]
419
478
def check_file_has_more_content(self):
420
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')
422
484
def do_delete_file(self):
423
485
return [('unversion', 'file-id')]
425
487
def check_file_doesnt_exist(self):
426
self.failIfExists('branch/file')
488
self.assertPathDoesNotExist('branch/file')
490
def do_create_file_in_dir(self):
491
return [('add', ('dir', 'dir-id', 'directory', '')),
492
('add', ('dir/file', 'file-id', 'file', 'trunk content\n'))]
494
def do_modify_file_in_dir(self):
495
return [('modify', ('file-id', 'trunk content\nmore content\n'))]
497
def check_file_in_dir_has_more_content(self):
498
self.assertFileEqual('trunk content\nmore content\n', 'branch/dir/file')
500
def check_file_in_dir_doesnt_exist(self):
501
self.assertPathDoesNotExist('branch/dir/file')
428
503
def _get_resolve_path_arg(self, wt, action):
429
504
return self._path
457
531
# PathConflicts deletion handling requires a special
458
532
# hard-coded value
459
533
path='<deleted>', file_id='file-id')),),
534
# File renamed/deleted in dir
535
(dict(_base_actions='create_file_in_dir'),
536
('file_renamed_in_dir',
537
dict(actions='rename_file_in_dir', check='file_in_dir_renamed',
538
path='dir/new-file', file_id='file-id')),
540
dict(actions='delete_file', check='file_in_dir_doesnt_exist',
541
# PathConflicts deletion handling requires a special
543
path='<deleted>', file_id='file-id')),),
460
544
# File renamed/renamed differently
461
545
(dict(_base_actions='create_file'),
496
579
return [('rename', ('file', 'new-file'))]
498
581
def check_file_renamed(self):
499
self.failIfExists('branch/file')
500
self.failUnlessExists('branch/new-file')
582
self.assertPathDoesNotExist('branch/file')
583
self.assertPathExists('branch/new-file')
502
585
def do_rename_file2(self):
503
586
return [('rename', ('file', 'new-file2'))]
505
588
def check_file_renamed2(self):
506
self.failIfExists('branch/file')
507
self.failUnlessExists('branch/new-file2')
589
self.assertPathDoesNotExist('branch/file')
590
self.assertPathExists('branch/new-file2')
509
592
def do_rename_dir(self):
510
593
return [('rename', ('dir', 'new-dir'))]
512
595
def check_dir_renamed(self):
513
self.failIfExists('branch/dir')
514
self.failUnlessExists('branch/new-dir')
596
self.assertPathDoesNotExist('branch/dir')
597
self.assertPathExists('branch/new-dir')
516
599
def do_rename_dir2(self):
517
600
return [('rename', ('dir', 'new-dir2'))]
519
602
def check_dir_renamed2(self):
520
self.failIfExists('branch/dir')
521
self.failUnlessExists('branch/new-dir2')
603
self.assertPathDoesNotExist('branch/dir')
604
self.assertPathExists('branch/new-dir2')
523
606
def do_delete_file(self):
524
607
return [('unversion', 'file-id')]
526
609
def check_file_doesnt_exist(self):
527
self.failIfExists('branch/file')
610
self.assertPathDoesNotExist('branch/file')
529
612
def do_delete_dir(self):
530
613
return [('unversion', 'dir-id')]
532
615
def check_dir_doesnt_exist(self):
533
self.failIfExists('branch/dir')
616
self.assertPathDoesNotExist('branch/dir')
618
def do_create_file_in_dir(self):
619
return [('add', ('dir', 'dir-id', 'directory', '')),
620
('add', ('dir/file', 'file-id', 'file', 'trunk content\n'))]
622
def do_rename_file_in_dir(self):
623
return [('rename', ('dir/file', 'dir/new-file'))]
625
def check_file_in_dir_renamed(self):
626
self.assertPathDoesNotExist('branch/dir/file')
627
self.assertPathExists('branch/dir/new-file')
629
def check_file_in_dir_doesnt_exist(self):
630
self.assertPathDoesNotExist('branch/dir/file')
535
632
def _get_resolve_path_arg(self, wt, action):
536
633
tpath = self._this['path']
584
677
('fileb_created',
585
678
dict(actions='create_file_b', check='file_content_b',
586
679
path='file', file_id='file-b-id')),),
588
return mirror_scenarios(base_scenarios)
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')),),
590
690
def do_nothing(self):
602
702
def check_file_content_b(self):
603
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')
605
715
def _get_resolve_path_arg(self, wt, action):
606
716
return self._this['path']
692
800
def test_keep_them_all(self):
693
801
self.run_script("""
694
802
$ bzr resolve dir
695
$ bzr commit --strict -m 'No more conflicts nor unknown files'
803
2>2 conflicts resolved, 0 remaining
804
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
698
807
def test_adopt_child(self):
699
808
self.run_script("""
700
$ bzr mv dir/file2 file2
809
$ bzr mv -q dir/file2 file2
810
$ bzr rm -q dir --force
702
811
$ bzr resolve dir
703
$ bzr commit --strict -m 'No more conflicts nor unknown files'
812
2>2 conflicts resolved, 0 remaining
813
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
706
816
def test_kill_them_all(self):
707
817
self.run_script("""
818
$ bzr rm -q dir --force
709
819
$ bzr resolve dir
710
$ bzr commit --strict -m 'No more conflicts nor unknown files'
820
2>2 conflicts resolved, 0 remaining
821
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
713
824
def test_resolve_taking_this(self):
714
825
self.run_script("""
715
826
$ bzr resolve --take-this dir
716
$ bzr commit --strict -m 'No more conflicts nor unknown files'
828
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
719
831
def test_resolve_taking_other(self):
720
832
self.run_script("""
721
833
$ bzr resolve --take-other dir
722
$ bzr commit --strict -m 'No more conflicts nor unknown files'
835
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
732
846
$ echo 'trunk content' >dir/file
734
$ bzr commit -m 'Create trunk'
736
$ bzr rm dir/file --force
738
$ bzr commit -m 'Remove dir/file'
740
$ bzr branch . -r 1 ../branch
848
$ bzr commit -m 'Create trunk' -q
849
$ bzr rm -q dir/file --force
850
$ bzr rm -q dir --force
851
$ bzr commit -q -m 'Remove dir/file'
852
$ bzr branch -q . -r 1 ../branch
742
854
$ echo 'branch content' >dir/file2
744
$ bzr commit -m 'Add dir/file2 in branch'
855
$ bzr add -q dir/file2
856
$ bzr commit -q -m 'Add dir/file2 in branch'
746
857
$ bzr merge ../trunk
748
859
2>Conflict: can't delete dir because it is not empty. Not deleting.
753
864
def test_keep_them_all(self):
754
865
self.run_script("""
755
866
$ bzr resolve dir
756
$ bzr commit --strict -m 'No more conflicts nor unknown files'
867
2>2 conflicts resolved, 0 remaining
868
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
759
871
def test_adopt_child(self):
760
872
self.run_script("""
761
$ bzr mv dir/file2 file2
873
$ bzr mv -q dir/file2 file2
874
$ bzr rm -q dir --force
763
875
$ bzr resolve dir
764
$ bzr commit --strict -m 'No more conflicts nor unknown files'
876
2>2 conflicts resolved, 0 remaining
877
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
767
880
def test_kill_them_all(self):
768
881
self.run_script("""
882
$ bzr rm -q dir --force
770
883
$ bzr resolve dir
771
$ bzr commit --strict -m 'No more conflicts nor unknown files'
884
2>2 conflicts resolved, 0 remaining
885
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
774
888
def test_resolve_taking_this(self):
775
889
self.run_script("""
776
890
$ bzr resolve --take-this dir
777
$ bzr commit --strict -m 'No more conflicts nor unknown files'
891
2>2 conflicts resolved, 0 remaining
892
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
780
895
def test_resolve_taking_other(self):
781
896
self.run_script("""
782
897
$ bzr resolve --take-other dir
783
$ bzr commit --strict -m 'No more conflicts nor unknown files'
900
2>2 conflicts resolved, 0 remaining
901
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
787
905
class TestResolveParentLoop(TestParametrizedResolveConflicts):
789
_conflict_type = conflicts.ParentLoop,
907
_conflict_type = conflicts.ParentLoop
791
909
_this_args = None
792
910
_other_args = None
796
# Each side dict additionally defines:
797
# - dir_id: the directory being moved
798
# - target_id: The target directory
799
# - xfail: whether the test is expected to fail if the action is
800
# involved as 'other'
912
# Each side dict additionally defines:
913
# - dir_id: the directory being moved
914
# - target_id: The target directory
915
# - xfail: whether the test is expected to fail if the action is
916
# involved as 'other'
917
scenarios = mirror_scenarios(
802
919
# Dirs moved into each other
803
920
(dict(_base_actions='create_dir1_dir2'),
804
921
('dir1_into_dir2',
826
942
return [('rename', ('dir1', 'dir2/dir1'))]
828
944
def check_dir1_moved(self):
829
self.failIfExists('branch/dir1')
830
self.failUnlessExists('branch/dir2/dir1')
945
self.assertPathDoesNotExist('branch/dir1')
946
self.assertPathExists('branch/dir2/dir1')
832
948
def do_move_dir2_into_dir1(self):
833
949
return [('rename', ('dir2', 'dir1/dir2'))]
835
951
def check_dir2_moved(self):
836
self.failIfExists('branch/dir2')
837
self.failUnlessExists('branch/dir1/dir2')
952
self.assertPathDoesNotExist('branch/dir2')
953
self.assertPathExists('branch/dir1/dir2')
839
955
def do_create_dir1_4(self):
840
956
return [('add', ('dir1', 'dir1-id', 'directory', '')),
846
962
return [('rename', ('dir1', 'dir3/dir4/dir1'))]
848
964
def check_dir1_2_moved(self):
849
self.failIfExists('branch/dir1')
850
self.failUnlessExists('branch/dir3/dir4/dir1')
851
self.failUnlessExists('branch/dir3/dir4/dir1/dir2')
965
self.assertPathDoesNotExist('branch/dir1')
966
self.assertPathExists('branch/dir3/dir4/dir1')
967
self.assertPathExists('branch/dir3/dir4/dir1/dir2')
853
969
def do_move_dir3_into_dir2(self):
854
970
return [('rename', ('dir3', 'dir1/dir2/dir3'))]
856
972
def check_dir3_4_moved(self):
857
self.failIfExists('branch/dir3')
858
self.failUnlessExists('branch/dir1/dir2/dir3')
859
self.failUnlessExists('branch/dir1/dir2/dir3/dir4')
973
self.assertPathDoesNotExist('branch/dir3')
974
self.assertPathExists('branch/dir1/dir2/dir3')
975
self.assertPathExists('branch/dir1/dir2/dir3/dir4')
861
977
def _get_resolve_path_arg(self, wt, action):
862
978
# ParentLoop says: moving <conflict_path> into <path>. Cancelled move.
907
1023
def test_take_this(self):
908
1024
self.run_script("""
909
$ bzr rm foo.new --force
1025
$ bzr rm -q foo.new --force
910
1026
# FIXME: Isn't it weird that foo is now unkown even if foo.new has been put
911
1027
# aside ? -- vila 090916
913
1029
$ bzr resolve foo.new
914
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1030
2>1 conflict resolved, 0 remaining
1031
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
917
1034
def test_take_other(self):
918
1035
self.run_script("""
1036
$ bzr rm -q foo --force
1037
$ bzr mv -q foo.new foo
921
1038
$ bzr resolve foo
922
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1039
2>1 conflict resolved, 0 remaining
1040
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
925
1043
def test_resolve_taking_this(self):
926
1044
self.run_script("""
927
1045
$ bzr resolve --take-this foo.new
928
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1047
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
931
1050
def test_resolve_taking_other(self):
932
1051
self.run_script("""
933
1052
$ bzr resolve --take-other foo.new
934
$ bzr commit --strict -m 'No more conflicts nor unknown files'
1054
$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
941
1061
# This is nearly like TestResolveNonDirectoryParent but with branch and
942
1062
# trunk switched. As such it should certainly produce the same
1064
self.assertRaises(errors.MalformedTransform,
945
1066
$ bzr init trunk
948
$ bzr commit -m 'Create trunk'
1071
$ bzr commit -m 'Create trunk' -q
950
1073
$ echo "Boo!" >foo
951
$ bzr commit -m 'foo is now a file'
953
$ bzr branch . -r 1 ../branch
1074
$ bzr commit -m 'foo is now a file' -q
1075
$ bzr branch -q . -r 1 ../branch -q
955
1077
$ echo "Boing" >foo/bar
957
$ bzr commit -m 'Add foo/bar'
1078
$ bzr add -q foo/bar -q
1079
$ bzr commit -m 'Add foo/bar' -q
959
1080
$ bzr merge ../trunk
960
1081
2>bzr: ERROR: Tree transform is malformed [('unversioned executability', 'new-1')]
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.
964
1170
class TestResolveActionOption(tests.TestCase):
966
1172
def setUp(self):
added
removed
bzrlib/tests/test_conflicts.py
