171
171
# get all three files and a pending merge.
172
172
out, err = self.run_bzr('update checkout')
173
173
self.assertEqual('', out)
174
self.assertEqualDiff("""+N file
174
self.assertEqualDiff("""+N file_b
175
175
All changes applied successfully.
177
177
All changes applied successfully.
178
178
Updated to revision 1 of branch %s
179
179
Your local commits will now show as pending merges with 'bzr status', and can be committed with 'bzr commit'.
242
242
self.run_bzr('update checkout')
244
244
def test_update_dash_r(self):
245
# Test that 'bzr update' works correctly when you have
246
# an update in the master tree, and a lightweight checkout
247
# which has merged another branch
248
245
master = self.make_branch_and_tree('master')
249
246
os.chdir('master')
250
247
self.build_tree(['./file1'])
266
263
self.assertEquals(['m1'], master.get_parent_ids())
268
265
def test_update_dash_r_outside_history(self):
269
# Test that 'bzr update' works correctly when you have
270
# an update in the master tree, and a lightweight checkout
271
# which has merged another branch
272
266
master = self.make_branch_and_tree('master')
273
267
self.build_tree(['master/file1'])
274
268
master.add(['file1'])
315
309
2>All changes applied successfully.
316
310
2>Updated to revision 2 of branch .../master
313
def test_update_checkout_prevent_double_merge(self):
314
""""Launchpad bug 113809 in bzr "update performs two merges"
315
https://launchpad.net/bugs/113809"""
316
master = self.make_branch_and_tree('master')
317
self.build_tree_contents([('master/file', 'initial contents\n')])
319
master.commit('one', rev_id='m1')
321
checkout = master.branch.create_checkout('checkout')
322
lightweight = checkout.branch.create_checkout('lightweight',
325
# time to create a mess
326
# add a commit to the master
327
self.build_tree_contents([('master/file', 'master\n')])
328
master.commit('two', rev_id='m2')
329
self.build_tree_contents([('master/file', 'master local changes\n')])
331
# local commit on the checkout
332
self.build_tree_contents([('checkout/file', 'checkout\n')])
333
checkout.commit('tree', rev_id='c2', local=True)
334
self.build_tree_contents([('checkout/file',
335
'checkout local changes\n')])
338
self.build_tree_contents([('lightweight/file',
339
'lightweight local changes\n')])
341
# now update (and get conflicts)
342
out, err = self.run_bzr('update lightweight', retcode=1)
343
self.assertEqual('', out)
344
self.assertFileEqual('''\
346
lightweight local changes
354
self.build_tree_contents([('lightweight/file',
355
'lightweight+checkout\n')])
356
self.run_bzr('resolve lightweight/file')
358
# check we get the second conflict
359
out, err = self.run_bzr('update lightweight', retcode=1)
360
self.assertEqual('', out)
361
self.assertFileEqual('''\
added
removed
bzrlib/tests/blackbox/test_update.py
