← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_remerge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-21 05:22:37 UTC
  • mfrom: (2490.2.33 graphwalker)
  • Revision ID: pqm@pqm.ubuntu.com-20070621052237-2phm1z5dg4arrwnk
Avoid topological sorting in Repository.get_ancestry where possible

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remerge.py
38
38
        self.make_file('answer', "42")
39
39
        self.run_bzr('init')
40
40
        self.run_bzr('add')
41
 
        self.run_bzr('commit -m base')
42
 
        self.run_bzr('branch . ../other')
43
 
        self.run_bzr('branch . ../this')
 
41
        self.run_bzr('commit', '-m', 'base')
 
42
        self.run_bzr('branch', '.', '../other')
 
43
        self.run_bzr('branch', '.', '../this')
44
44
        os.chdir('../other')
45
45
        self.make_file('hello', "Hello.")
46
46
        self.make_file('answer', "Is anyone there?")
47
 
        self.run_bzr('commit -m other')
 
47
        self.run_bzr('commit', '-m', 'other')
48
48
        os.chdir('../this')
49
49
        self.make_file('hello', "Hello, world")
50
 
        self.run_bzr('mv answer question')
 
50
        self.run_bzr('mv', 'answer', 'question')
51
51
        self.make_file('question', "What do you get when you multiply six"
52
52
                                   "times nine?")
53
 
        self.run_bzr('commit -m this')
 
53
        self.run_bzr('commit', '-m', 'this')
54
54
 
55
55
    def test_remerge(self):
56
56
        """Remerge command works as expected"""
57
57
        self.create_conflicts()
58
 
        self.run_bzr('merge ../other --show-base', retcode=1)
 
58
        self.run_bzr('merge', '../other', '--show-base', retcode=1)
59
59
        conflict_text = open('hello').read()
60
60
        self.assertTrue('|||||||' in conflict_text)
61
61
        self.assertTrue('hi world' in conflict_text)
69
69
        os.unlink('question.OTHER')
70
70
 
71
71
        self.run_bzr_error(['jello is not versioned'],
72
 
                     'remerge jello --merge-type weave')
 
72
                     'remerge', 'jello', '--merge-type', 'weave')
73
73
        self.run_bzr_error(['conflicts encountered'],
74
 
                           'remerge hello --merge-type weave',
 
74
                           'remerge', 'hello', '--merge-type', 'weave',
75
75
                           retcode=1)
76
76
 
77
77
        self.failUnlessExists('hello.OTHER')
78
78
        self.failIfExists('question.OTHER')
79
79
 
80
 
        file_id = self.run_bzr('file-id hello')[0]
 
80
        file_id = self.run_bzr('file-id', 'hello')[0]
81
81
        self.run_bzr_error(['hello.THIS is not versioned'],
82
 
                           'file-id hello.THIS')
 
82
                           'file-id', 'hello.THIS')
83
83
 
84
84
        self.run_bzr_error(['conflicts encountered'],
85
 
                           'remerge --merge-type weave', retcode=1)
 
85
                           'remerge', '--merge-type', 'weave', retcode=1)
86
86
 
87
87
        self.failUnlessExists('hello.OTHER')
88
88
        self.failIfExists('hello.BASE')
90
90
        self.assertFalse('hi world' in conflict_text)
91
91
 
92
92
        self.run_bzr_error(['Showing base is not supported.*Weave'],
93
 
                           'remerge . --merge-type weave --show-base')
 
93
                           'remerge', '.', '--merge-type', 'weave', '--show-base')
94
94
        self.run_bzr_error(['Can\'t reprocess and show base'],
95
 
                           'remerge . --show-base --reprocess')
96
 
        self.run_bzr_error(['conflicts encountered'],
97
 
                           'remerge . --merge-type weave --reprocess',
98
 
                           retcode=1)
99
 
        self.run_bzr_error(['conflicts encountered'],
100
 
                           'remerge hello --show-base',
101
 
                           retcode=1)
102
 
        self.run_bzr_error(['conflicts encountered'],
103
 
                           'remerge hello --reprocess', retcode=1)
 
95
                           'remerge', '.', '--show-base', '--reprocess')
 
96
        self.run_bzr_error(['conflicts encountered'],
 
97
                           'remerge', '.', '--merge-type', 'weave', '--reprocess',
 
98
                           retcode=1)
 
99
        self.run_bzr_error(['conflicts encountered'],
 
100
                           'remerge', 'hello', '--show-base',
 
101
                           retcode=1)
 
102
        self.run_bzr_error(['conflicts encountered'],
 
103
                           'remerge', 'hello', '--reprocess', retcode=1)
104
104
 
105
 
        self.run_bzr('resolve --all')
106
 
        self.run_bzr('commit -m done')
 
105
        self.run_bzr('resolve', '--all')
 
106
        self.run_bzr('commit', '-m', 'done')
107
107
 
108
108
        self.run_bzr_error(['remerge only works after normal merges',
109
109
                            'Not cherrypicking or multi-merges'],
111
111
 
112
112
    def test_conflicts(self):
113
113
        self.create_conflicts()
114
 
        self.run_bzr('merge ../other', retcode=1)
 
114
        self.run_bzr('merge', '../other', retcode=1)
115
115
        wt = WorkingTree.open('.')
116
116
        self.assertEqual(2, len(wt.conflicts()))
117
117
        self.run_bzr('remerge', retcode=1)
118
118
        wt = WorkingTree.open('.')
119
119
        self.assertEqual(2, len(wt.conflicts()))
120
 
        self.run_bzr('remerge hello', retcode=1)
 
120
        self.run_bzr('remerge', 'hello', retcode=1)
121
121
        self.assertEqual(2, len(wt.conflicts()))