130
130
self.assertEquals(self.capture('unknowns'), '')
131
131
self.assertEquals(file('.bzrignore', 'rU').read(), '*.blah\ngarh\n')
133
def test_revert(self):
136
file('hello', 'wt').write('foo')
137
self.runbzr('add hello')
138
self.runbzr('commit -m setup hello')
140
file('goodbye', 'wt').write('baz')
141
self.runbzr('add goodbye')
142
self.runbzr('commit -m setup goodbye')
144
file('hello', 'wt').write('bar')
145
file('goodbye', 'wt').write('qux')
146
self.runbzr('revert hello')
147
self.check_file_contents('hello', 'foo')
148
self.check_file_contents('goodbye', 'qux')
149
self.runbzr('revert')
150
self.check_file_contents('goodbye', 'baz')
152
os.mkdir('revertdir')
153
self.runbzr('add revertdir')
154
self.runbzr('commit -m f')
155
os.rmdir('revertdir')
156
self.runbzr('revert')
159
os.symlink('/unlikely/to/exist', 'symlink')
160
self.runbzr('add symlink')
161
self.runbzr('commit -m f')
163
self.runbzr('revert')
164
self.failUnlessExists('symlink')
166
os.symlink('a-different-path', 'symlink')
167
self.runbzr('revert')
168
self.assertEqual('/unlikely/to/exist',
169
os.readlink('symlink'))
171
self.log("skipping revert symlink tests")
173
file('hello', 'wt').write('xyz')
174
self.runbzr('commit -m xyz hello')
175
self.runbzr('revert -r 1 hello')
176
self.check_file_contents('hello', 'foo')
177
self.runbzr('revert hello')
178
self.check_file_contents('hello', 'xyz')
179
os.chdir('revertdir')
180
self.runbzr('revert')
183
133
def test_mv_modes(self):
184
134
"""Test two modes of operation for mv"""
185
135
self.runbzr('init')
492
442
self.runbzr('commit -m this')
494
def test_remerge(self):
495
"""Remerge command works as expected"""
496
self.create_conflicts()
497
self.runbzr('merge ../other --show-base', retcode=1)
498
conflict_text = file('hello').read()
499
assert '|||||||' in conflict_text
500
assert 'hi world' in conflict_text
501
self.runbzr('remerge', retcode=1)
502
conflict_text = file('hello').read()
503
assert '|||||||' not in conflict_text
504
assert 'hi world' not in conflict_text
505
os.unlink('hello.OTHER')
506
os.unlink('question.OTHER')
507
self.runbzr('remerge jello --merge-type weave', retcode=3)
508
self.runbzr('remerge hello --merge-type weave', retcode=1)
509
assert os.path.exists('hello.OTHER')
510
self.assertIs(False, os.path.exists('question.OTHER'))
511
file_id = self.runbzr('file-id hello')
512
file_id = self.runbzr('file-id hello.THIS', retcode=3)
513
self.runbzr('remerge --merge-type weave', retcode=1)
514
assert os.path.exists('hello.OTHER')
515
assert not os.path.exists('hello.BASE')
516
assert '|||||||' not in conflict_text
517
assert 'hi world' not in conflict_text
518
self.runbzr('remerge . --merge-type weave --show-base', retcode=3)
519
self.runbzr('remerge . --show-base --reprocess', retcode=3)
520
self.runbzr('remerge . --merge-type weave --reprocess', retcode=1)
521
self.runbzr('remerge hello --show-base', retcode=1)
522
self.runbzr('remerge hello --reprocess', retcode=1)
523
self.runbzr('resolve --all')
524
self.runbzr('commit -m done',)
525
self.runbzr('remerge', retcode=3)
527
444
def test_status(self):
528
445
os.mkdir('branch1')
529
446
os.chdir('branch1')