« back to all changes in this revision
Viewing changes to bzrlib/tests/test_conflicts.py
- browse files at revision 4597.3.63
- compare with another revision
- compare with revision 5020.1.1
- download diff
- download tarball
- view history from revision 4597.3.63
- Committer: Vincent Ladeuil
- Date: 2010-01-05 17:06:38 UTC
- mto: (4597.3.66 dont-add-conflict-helpers) (5008.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5009.
- Revision ID: v.ladeuil+lp@free.fr-20100105170638-5355y6f8go0luo52
That's take-theirs not take-their.
- files modified:
- NEWS
added
removed
bzrlib/tests/test_conflicts.py
224
224
$ bzr commit --strict -m 'No more conflicts nor unknown files'
225
225
""")
226
226
227
def test_take_their(self):
227
def test_take_theirs(self):
228
228
self.run_script("""
229
229
$ bzr mv file.OTHER file
230
230
$ bzr resolve file
237
237
$ bzr commit --strict -m 'No more conflicts nor unknown files'
238
238
""")
239
239
240
def test_resolve_taking_their(self):
240
def test_resolve_taking_theirs(self):
241
241
self.run_script("""
242
$ bzr resolve --take-their file
242
$ bzr resolve --take-theirs file
243
243
$ bzr commit --strict -m 'No more conflicts nor unknown files'
244
244
""")
245
245
292
292
$ bzr commit --strict -m 'No more conflicts nor unknown files'
293
293
""")
294
294
295
def test_resolve_taking_their(self):
295
def test_resolve_taking_theirs(self):
296
296
self.run_script("""
297
$ bzr resolve --take-their file2
297
$ bzr resolve --take-theirs file2
298
298
$ bzr commit --strict -m 'No more conflicts nor unknown files'
299
299
""")
300
300
335
335
$ bzr commit --strict -m 'No more conflicts nor unknown files'
336
336
""")
337
337
338
def test_take_their(self):
338
def test_take_theirs(self):
339
339
self.run_script("""
340
340
$ bzr resolve dir
341
341
$ bzr commit --strict -m 'No more conflicts nor unknown files'
396
396
$ bzr commit --strict -m 'No more conflicts nor unknown files'
397
397
""")
398
398
399
def test_resolve_taking_their(self):
399
def test_resolve_taking_theirs(self):
400
400
self.run_script("""
401
$ bzr resolve --take-their dir
401
$ bzr resolve --take-theirs dir
402
402
$ bzr commit --strict -m 'No more conflicts nor unknown files'
403
403
""")
404
404
456
456
$ bzr commit --strict -m 'No more conflicts nor unknown files'
457
457
""")
458
458
459
def test_resolve_taking_their(self):
459
def test_resolve_taking_theirs(self):
460
460
self.run_script("""
461
$ bzr resolve --take-their dir
461
$ bzr resolve --take-theirs dir
462
462
$ bzr commit --strict -m 'No more conflicts nor unknown files'
463
463
""")
464
464
504
504
$ bzr commit --strict -m 'No more conflicts nor unknown files'
505
505
""")
506
506
507
def test_resolve_taking_their(self):
507
def test_resolve_taking_theirs(self):
508
508
self.run_script("""
509
$ bzr resolve --take-their file-in-branch
509
$ bzr resolve --take-theirs file-in-branch
510
510
$ bzr commit --strict -m 'No more conflicts nor unknown files'
511
511
""")
512
512
538
538
$ bzr commit --strict -m 'No more conflicts nor unknown files'
539
539
""")
540
540
541
def test_take_their(self):
541
def test_take_theirs(self):
542
542
self.run_script("""
543
543
$ bzr mv dir2/dir1 dir1
544
544
$ bzr mv dir2 dir1
552
552
$ bzr commit --strict -m 'No more conflicts nor unknown files'
553
553
""")
554
554
555
def test_resolve_taking_their(self):
555
def test_resolve_taking_theirs(self):
556
556
self.run_script("""
557
$ bzr resolve --take-their dir2
557
$ bzr resolve --take-theirs dir2
558
558
$ bzr commit --strict -m 'No more conflicts nor unknown files'
559
559
""")
560
560
595
595
$ bzr commit --strict -m 'No more conflicts nor unknown files'
596
596
""")
597
597
598
def test_take_their(self):
598
def test_take_theirs(self):
599
599
self.run_script("""
600
600
$ bzr rm foo --force
601
601
$ bzr mv foo.new foo
609
609
$ bzr commit --strict -m 'No more conflicts nor unknown files'
610
610
""")
611
611
612
def test_resolve_taking_their(self):
612
def test_resolve_taking_theirs(self):
613
613
self.run_script("""
614
$ bzr resolve --take-their foo.new
614
$ bzr resolve --take-theirs foo.new
615
615
$ bzr commit --strict -m 'No more conflicts nor unknown files'
616
616
""")
617
617
667
667
opts, args = self.parse(['--keep-mine'])
668
668
self.assertEqual({'action': 'keep_mine'}, opts)
669
669
670
def test_take_their(self):
671
opts, args = self.parse(['--action', 'take-their'])
672
self.assertEqual({'action': 'take_their'}, opts)
673
opts, args = self.parse(['--take-their'])
674
self.assertEqual({'action': 'take_their'}, opts)
670
def test_take_theirs(self):
671
opts, args = self.parse(['--action', 'take-theirs'])
672
self.assertEqual({'action': 'take_theirs'}, opts)
673
opts, args = self.parse(['--take-theirs'])
674
self.assertEqual({'action': 'take_theirs'}, opts)
Loggerhead is a web-based interface for Breezy
Version: 2.0.1