/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Robey Pointer
  • Date: 2006-07-01 19:03:33 UTC
  • mfrom: (1829 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1830.
  • Revision ID: robey@lag.net-20060701190333-f58465aec4bd3412
merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remerge.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 by Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
18
import os
25
25
 
26
26
    def make_file(self, name, contents):
27
27
        f = open(name, 'wb')
28
 
        try:
29
 
            f.write(contents)
30
 
        finally:
31
 
            f.close()
 
28
        f.write(contents)
 
29
        f.close()
32
30
 
33
31
    def create_conflicts(self):
34
32
        """Create a conflicted tree"""
38
36
        self.make_file('answer', "42")
39
37
        self.run_bzr('init')
40
38
        self.run_bzr('add')
41
 
        self.run_bzr('commit -m base')
42
 
        self.run_bzr('branch . ../other')
43
 
        self.run_bzr('branch . ../this')
 
39
        self.run_bzr('commit', '-m', 'base')
 
40
        self.run_bzr('branch', '.', '../other')
 
41
        self.run_bzr('branch', '.', '../this')
44
42
        os.chdir('../other')
45
43
        self.make_file('hello', "Hello.")
46
44
        self.make_file('answer', "Is anyone there?")
47
 
        self.run_bzr('commit -m other')
 
45
        self.run_bzr('commit', '-m', 'other')
48
46
        os.chdir('../this')
49
47
        self.make_file('hello', "Hello, world")
50
 
        self.run_bzr('mv answer question')
 
48
        self.run_bzr('mv', 'answer', 'question')
51
49
        self.make_file('question', "What do you get when you multiply six"
52
50
                                   "times nine?")
53
 
        self.run_bzr('commit -m this')
 
51
        self.run_bzr('commit', '-m', 'this')
54
52
 
55
53
    def test_remerge(self):
56
54
        """Remerge command works as expected"""
57
55
        self.create_conflicts()
58
 
        self.run_bzr('merge ../other --show-base', retcode=1)
 
56
        self.run_bzr('merge', '../other', '--show-base', retcode=1)
59
57
        conflict_text = open('hello').read()
60
58
        self.assertTrue('|||||||' in conflict_text)
61
59
        self.assertTrue('hi world' in conflict_text)
69
67
        os.unlink('question.OTHER')
70
68
 
71
69
        self.run_bzr_error(['jello is not versioned'],
72
 
                     'remerge jello --merge-type weave')
 
70
                     'remerge', 'jello', '--merge-type', 'weave')
73
71
        self.run_bzr_error(['conflicts encountered'],
74
 
                           'remerge hello --merge-type weave',
 
72
                           'remerge', 'hello', '--merge-type', 'weave',
75
73
                           retcode=1)
76
74
 
77
75
        self.failUnlessExists('hello.OTHER')
78
76
        self.failIfExists('question.OTHER')
79
77
 
80
 
        file_id = self.run_bzr('file-id hello')[0]
81
 
        self.run_bzr_error(['hello.THIS is not versioned'],
82
 
                           'file-id hello.THIS')
 
78
        file_id = self.run_bzr('file-id', 'hello')[0]
 
79
        self.run_bzr_error(['\'hello.THIS\' is not a versioned file'],
 
80
                           'file-id', 'hello.THIS')
83
81
 
84
82
        self.run_bzr_error(['conflicts encountered'],
85
 
                           'remerge --merge-type weave', retcode=1)
 
83
                           'remerge', '--merge-type', 'weave', retcode=1)
86
84
 
87
85
        self.failUnlessExists('hello.OTHER')
88
 
        self.failUnless('hello.BASE')
 
86
        self.failIfExists('hello.BASE')
89
87
        self.assertFalse('|||||||' in conflict_text)
90
88
        self.assertFalse('hi world' in conflict_text)
91
89
 
92
90
        self.run_bzr_error(['Showing base is not supported.*Weave'],
93
 
                           'remerge . --merge-type weave --show-base')
 
91
                           'remerge', '.', '--merge-type', 'weave', '--show-base')
94
92
        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)
 
93
                           'remerge', '.', '--show-base', '--reprocess')
 
94
        self.run_bzr_error(['conflicts encountered'],
 
95
                           'remerge', '.', '--merge-type', 'weave', '--reprocess',
 
96
                           retcode=1)
 
97
        self.run_bzr_error(['conflicts encountered'],
 
98
                           'remerge', 'hello', '--show-base',
 
99
                           retcode=1)
 
100
        self.run_bzr_error(['conflicts encountered'],
 
101
                           'remerge', 'hello', '--reprocess', retcode=1)
104
102
 
105
 
        self.run_bzr('resolve --all')
106
 
        self.run_bzr('commit -m done')
 
103
        self.run_bzr('resolve', '--all')
 
104
        self.run_bzr('commit', '-m', 'done')
107
105
 
108
106
        self.run_bzr_error(['remerge only works after normal merges',
109
107
                            'Not cherrypicking or multi-merges'],
110
108
                           'remerge')
111
 
 
112
 
    def test_conflicts(self):
113
 
        self.create_conflicts()
114
 
        self.run_bzr('merge ../other', retcode=1)
115
 
        wt = WorkingTree.open('.')
116
 
        self.assertEqual(2, len(wt.conflicts()))
117
 
        self.run_bzr('remerge', retcode=1)
118
 
        wt = WorkingTree.open('.')
119
 
        self.assertEqual(2, len(wt.conflicts()))
120
 
        self.run_bzr('remerge hello', retcode=1)
121
 
        self.assertEqual(2, len(wt.conflicts()))