241
239
lightweight=True)
242
240
tree.commit('empty commit')
243
241
self.run_bzr('update checkout')
245
def test_update_with_merge_merged_to_master(self):
246
# Test that 'bzr update' works correctly when you have
247
# an update in the master tree, and a [lightweight or otherwise]
248
# checkout which has merge a revision merged to master already.
249
master = self.make_branch_and_tree('master')
250
self.build_tree(['master/file'])
252
master.commit('one', rev_id='m1')
254
self.build_tree(['checkout1/'])
255
checkout_dir = bzrdir.BzrDirMetaFormat1().initialize('checkout1')
256
branch.BranchReferenceFormat().initialize(checkout_dir,
257
target_branch=master.branch)
258
checkout1 = checkout_dir.create_workingtree('m1')
260
# Create a second branch, with an extra commit
261
other = master.bzrdir.sprout('other').open_workingtree()
262
self.build_tree(['other/file2'])
264
other.commit('other2', rev_id='o2')
266
# Merge the other branch into checkout - 'start reviewing a patch'
267
checkout1.merge_from_branch(other.branch)
268
self.assertEqual(['o2'], checkout1.get_parent_ids()[1:])
270
# Create a new commit in the master branch - 'someone else lands its'
271
master.merge_from_branch(other.branch)
272
master.commit('f3', rev_id='m2')
274
# This should not report about local commits being pending
275
# merges, because they were real merges (but are now gone).
276
# It should perhaps report on them.
277
out, err = self.run_bzr('update', working_dir='checkout1')
278
self.assertEqual('', out)
279
self.assertEqualDiff('''All changes applied successfully.
280
Updated to revision 2 of branch %s
281
''' % osutils.pathjoin(self.test_dir, 'master',),
283
# The pending merges should still be there
284
self.assertEqual([], checkout1.get_parent_ids()[1:])
286
def test_update_dash_r(self):
287
master = self.make_branch_and_tree('master')
289
self.build_tree(['./file1'])
290
master.add(['file1'])
291
master.commit('one', rev_id='m1')
292
self.build_tree(['./file2'])
293
master.add(['file2'])
294
master.commit('two', rev_id='m2')
297
sr.run_script(self, '''
300
2>All changes applied successfully.
301
2>Updated to revision 1 of .../master
303
self.assertPathExists('./file1')
304
self.assertPathDoesNotExist('./file2')
305
self.assertEquals(['m1'], master.get_parent_ids())
307
def test_update_dash_r_outside_history(self):
308
"""Ensure that we can update -r to dotted revisions.
310
master = self.make_branch_and_tree('master')
311
self.build_tree(['master/file1'])
312
master.add(['file1'])
313
master.commit('one', rev_id='m1')
315
# Create a second branch, with extra commits
316
other = master.bzrdir.sprout('other').open_workingtree()
317
self.build_tree(['other/file2', 'other/file3'])
319
other.commit('other2', rev_id='o2')
321
other.commit('other3', rev_id='o3')
324
self.run_bzr('merge ../other')
325
master.commit('merge', rev_id='merge')
327
# Switch to o2. file3 was added only in o3 and should be deleted.
328
out, err = self.run_bzr('update -r revid:o2')
329
self.assertContainsRe(err, '-D\s+file3')
330
self.assertContainsRe(err, 'All changes applied successfully\.')
331
self.assertContainsRe(err, 'Updated to revision 1.1.1 of branch .*')
333
# Switch back to latest
334
out, err = self.run_bzr('update')
335
self.assertContainsRe(err, '\+N\s+file3')
336
self.assertContainsRe(err, 'All changes applied successfully\.')
337
self.assertContainsRe(err, 'Updated to revision 2 of branch .*')
339
def test_update_dash_r_in_master(self):
340
# Test that 'bzr update' works correctly when you have
341
# an update in the master tree,
342
master = self.make_branch_and_tree('master')
343
self.build_tree(['master/file1'])
344
master.add(['file1'])
345
master.commit('one', rev_id='m1')
347
self.run_bzr('checkout master checkout')
349
# add a revision in the master.
350
self.build_tree(['master/file2'])
351
master.add(['file2'])
352
master.commit('two', rev_id='m2')
356
sr.run_script(self, '''
357
$ bzr update -r revid:m2
359
2>All changes applied successfully.
360
2>Updated to revision 2 of branch .../master
363
def test_update_show_base(self):
364
"""bzr update support --show-base
366
see https://bugs.launchpad.net/bzr/+bug/202374"""
368
tree=self.make_branch_and_tree('.')
370
f = open('hello','wt')
376
f = open('hello','wt')
381
#tree.update() gives no such revision, so ...
382
self.run_bzr(['update','-r1'])
385
f = open('hello','wt')
389
out, err = self.run_bzr(['update','--show-base'],retcode=1)
391
# check for conflict notification
392
self.assertContainsString(err,
393
' M hello\nText conflict in hello\n1 conflicts encountered.\n')
395
self.assertEqualDiff('<<<<<<< TREE\n'
396
'fie||||||| BASE-REVISION\n'
398
'fee>>>>>>> MERGE-SOURCE\n',
399
open('hello').read())
401
def test_update_checkout_prevent_double_merge(self):
402
""""Launchpad bug 113809 in bzr "update performs two merges"
403
https://launchpad.net/bugs/113809"""
404
master = self.make_branch_and_tree('master')
405
self.build_tree_contents([('master/file', 'initial contents\n')])
407
master.commit('one', rev_id='m1')
409
checkout = master.branch.create_checkout('checkout')
410
lightweight = checkout.branch.create_checkout('lightweight',
413
# time to create a mess
414
# add a commit to the master
415
self.build_tree_contents([('master/file', 'master\n')])
416
master.commit('two', rev_id='m2')
417
self.build_tree_contents([('master/file', 'master local changes\n')])
419
# local commit on the checkout
420
self.build_tree_contents([('checkout/file', 'checkout\n')])
421
checkout.commit('tree', rev_id='c2', local=True)
422
self.build_tree_contents([('checkout/file',
423
'checkout local changes\n')])
426
self.build_tree_contents([('lightweight/file',
427
'lightweight local changes\n')])
429
# now update (and get conflicts)
430
out, err = self.run_bzr('update lightweight', retcode=1)
431
self.assertEqual('', out)
432
# NB: these conflicts are actually in the source code
433
self.assertFileEqual('''\
435
lightweight local changes
443
self.build_tree_contents([('lightweight/file',
444
'lightweight+checkout\n')])
445
self.run_bzr('resolve lightweight/file')
447
# check we get the second conflict
448
out, err = self.run_bzr('update lightweight', retcode=1)
449
self.assertEqual('', out)
450
# NB: these conflicts are actually in the source code
451
self.assertFileEqual('''\
added
removed
bzrlib/tests/blackbox/test_update.py
