← 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: John Arbash Meinel
  • Author(s): Mark Hammond
  • Date: 2008-09-09 17:02:21 UTC
  • mto: This revision was merged to the branch mainline in revision 3697.
  • Revision ID: john@arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
An updated transparent icon for bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remerge.py
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
 
 
18
import os
 
19
 
 
20
from bzrlib.tests.blackbox import ExternalBase
 
21
from bzrlib.workingtree import WorkingTree
 
22
 
 
23
 
 
24
class TestRemerge(ExternalBase):
 
25
 
 
26
    def make_file(self, name, contents):
 
27
        f = open(name, 'wb')
 
28
        try:
 
29
            f.write(contents)
 
30
        finally:
 
31
            f.close()
 
32
 
 
33
    def create_conflicts(self):
 
34
        """Create a conflicted tree"""
 
35
        os.mkdir('base')
 
36
        os.chdir('base')
 
37
        self.make_file('hello', "hi world")
 
38
        self.make_file('answer', "42")
 
39
        self.run_bzr('init')
 
40
        self.run_bzr('add')
 
41
        self.run_bzr('commit -m base')
 
42
        self.run_bzr('branch . ../other')
 
43
        self.run_bzr('branch . ../this')
 
44
        os.chdir('../other')
 
45
        self.make_file('hello', "Hello.")
 
46
        self.make_file('answer', "Is anyone there?")
 
47
        self.run_bzr('commit -m other')
 
48
        os.chdir('../this')
 
49
        self.make_file('hello', "Hello, world")
 
50
        self.run_bzr('mv answer question')
 
51
        self.make_file('question', "What do you get when you multiply six"
 
52
                                   "times nine?")
 
53
        self.run_bzr('commit -m this')
 
54
 
 
55
    def test_remerge(self):
 
56
        """Remerge command works as expected"""
 
57
        self.create_conflicts()
 
58
        self.run_bzr('merge ../other --show-base', retcode=1)
 
59
        conflict_text = open('hello').read()
 
60
        self.assertTrue('|||||||' in conflict_text)
 
61
        self.assertTrue('hi world' in conflict_text)
 
62
 
 
63
        self.run_bzr_error(['conflicts encountered'], 'remerge', retcode=1)
 
64
        conflict_text = open('hello').read()
 
65
        self.assertFalse('|||||||' in conflict_text)
 
66
        self.assertFalse('hi world' in conflict_text)
 
67
 
 
68
        os.unlink('hello.OTHER')
 
69
        os.unlink('question.OTHER')
 
70
 
 
71
        self.run_bzr_error(['jello is not versioned'],
 
72
                     'remerge jello --merge-type weave')
 
73
        self.run_bzr_error(['conflicts encountered'],
 
74
                           'remerge hello --merge-type weave',
 
75
                           retcode=1)
 
76
 
 
77
        self.failUnlessExists('hello.OTHER')
 
78
        self.failIfExists('question.OTHER')
 
79
 
 
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')
 
83
 
 
84
        self.run_bzr_error(['conflicts encountered'],
 
85
                           'remerge --merge-type weave', retcode=1)
 
86
 
 
87
        self.failUnlessExists('hello.OTHER')
 
88
        self.failIfExists('hello.BASE')
 
89
        self.assertFalse('|||||||' in conflict_text)
 
90
        self.assertFalse('hi world' in conflict_text)
 
91
 
 
92
        self.run_bzr_error(['Showing base is not supported.*Weave'],
 
93
                           'remerge . --merge-type weave --show-base')
 
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)
 
104
 
 
105
        self.run_bzr('resolve --all')
 
106
        self.run_bzr('commit -m done')
 
107
 
 
108
        self.run_bzr_error(['remerge only works after normal merges',
 
109
                            'Not cherrypicking or multi-merges'],
 
110
                           '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()))