280
280
wt2.merge_from_branch(wt.branch)
281
281
wt2.commit('merged kind change')
283
def test_commit_aborted_does_not_apply_automatic_changes_bug_282402(self):
284
wt = self.make_branch_and_tree('.')
285
wt.add(['a'], ['a-id'], ['file'])
286
def fail_message(obj):
287
raise errors.BzrCommandError("empty commit message")
288
self.assertRaises(errors.BzrCommandError, wt.commit,
289
message_callback=fail_message)
290
self.assertEqual('a', wt.id2path('a-id'))
283
292
def test_local_commit_ignores_master(self):
284
293
# a --local commit does not require access to the master branch
285
294
# at all, or even for it to exist.
602
611
revid = tree.commit('first post')
603
612
committed_tree = tree.basis_tree()
604
613
self.assertTrue(committed_tree.has_filename("newfile"))
606
def test_commit_and_mv_dance_a(self):
607
# should fail because of
608
# <https://bugs.launchpad.net/bzr/+bug/395556> but apparently does
609
# not, while the blackbox.test_commit equivalent does - maybe because
610
# of different format combinations
611
tree = self.make_branch_and_tree(".")
612
self.build_tree(["a"])
614
tree.rename_one("a", "b")
615
tree.commit("Actually no, b")
616
tree.rename_one("b", "a")
617
tree.commit("No, really, a")
619
def test_commit_and_mv_dance_b(self):
620
# should fail because of
621
# <https://bugs.launchpad.net/bzr/+bug/395556> but apparently does
622
# not, while the blackbox.test_commit equivalent does - maybe because
623
# of different format combinations
624
tree = self.make_branch_and_tree(".")
625
self.build_tree(["b"])
627
tree.rename_one("b", "a")
628
tree.commit("Actually no, a")
629
tree.rename_one("a", "b")
630
tree.commit("No, really, b")