← 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: Arnaud Jeansen
  • Date: 2010-03-19 23:58:06 UTC
  • mto: This revision was merged to the branch mainline in revision 5126.
  • Revision ID: arnaud.jeansen@gmail.com-20100319235806-n0owdq874qsrb12u
Go back to unified report_delta method (i.e. former TreeDelta.show())

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remerge.py
1
 
# Copyright (C) 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009, 2010 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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
 
        f.write(contents)
29
 
        f.close()
 
28
        try:
 
29
            f.write(contents)
 
30
        finally:
 
31
            f.close()
30
32
 
31
33
    def create_conflicts(self):
32
34
        """Create a conflicted tree"""
36
38
        self.make_file('answer', "42")
37
39
        self.run_bzr('init')
38
40
        self.run_bzr('add')
39
 
        self.run_bzr('commit', '-m', 'base')
40
 
        self.run_bzr('branch', '.', '../other')
41
 
        self.run_bzr('branch', '.', '../this')
 
41
        self.run_bzr('commit -m base')
 
42
        self.run_bzr('branch . ../other')
 
43
        self.run_bzr('branch . ../this')
42
44
        os.chdir('../other')
43
45
        self.make_file('hello', "Hello.")
44
46
        self.make_file('answer', "Is anyone there?")
45
 
        self.run_bzr('commit', '-m', 'other')
 
47
        self.run_bzr('commit -m other')
46
48
        os.chdir('../this')
47
49
        self.make_file('hello', "Hello, world")
48
 
        self.run_bzr('mv', 'answer', 'question')
 
50
        self.run_bzr('mv answer question')
49
51
        self.make_file('question', "What do you get when you multiply six"
50
52
                                   "times nine?")
51
 
        self.run_bzr('commit', '-m', 'this')
 
53
        self.run_bzr('commit -m this')
52
54
 
53
55
    def test_remerge(self):
54
56
        """Remerge command works as expected"""
55
57
        self.create_conflicts()
56
 
        self.run_bzr('merge', '../other', '--show-base', retcode=1)
 
58
        self.run_bzr('merge ../other --show-base', retcode=1)
57
59
        conflict_text = open('hello').read()
58
60
        self.assertTrue('|||||||' in conflict_text)
59
61
        self.assertTrue('hi world' in conflict_text)
67
69
        os.unlink('question.OTHER')
68
70
 
69
71
        self.run_bzr_error(['jello is not versioned'],
70
 
                     'remerge', 'jello', '--merge-type', 'weave')
 
72
                     'remerge jello --merge-type weave')
71
73
        self.run_bzr_error(['conflicts encountered'],
72
 
                           'remerge', 'hello', '--merge-type', 'weave',
 
74
                           'remerge hello --merge-type weave',
73
75
                           retcode=1)
74
76
 
75
77
        self.failUnlessExists('hello.OTHER')
76
78
        self.failIfExists('question.OTHER')
77
79
 
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')
 
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')
81
83
 
82
84
        self.run_bzr_error(['conflicts encountered'],
83
 
                           'remerge', '--merge-type', 'weave', retcode=1)
 
85
                           'remerge --merge-type weave', retcode=1)
84
86
 
85
87
        self.failUnlessExists('hello.OTHER')
86
 
        self.failIfExists('hello.BASE')
 
88
        self.failUnless('hello.BASE')
87
89
        self.assertFalse('|||||||' in conflict_text)
88
90
        self.assertFalse('hi world' in conflict_text)
89
91
 
90
92
        self.run_bzr_error(['Showing base is not supported.*Weave'],
91
 
                           'remerge', '.', '--merge-type', 'weave', '--show-base')
 
93
                           'remerge . --merge-type weave --show-base')
92
94
        self.run_bzr_error(['Can\'t reprocess and show base'],
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)
 
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)
102
104
 
103
 
        self.run_bzr('resolve', '--all')
104
 
        self.run_bzr('commit', '-m', 'done')
 
105
        self.run_bzr('resolve --all')
 
106
        self.run_bzr('commit -m done')
105
107
 
106
108
        self.run_bzr_error(['remerge only works after normal merges',
107
109
                            'Not cherrypicking or multi-merges'],
108
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()))