At http://bzr.arbash-meinel.com/branches/bzr/1.8-dev/merge_reprocess
------------------------------------------------------------
revno: 3746
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
branch nick: merge_reprocess
timestamp: Thu 2008-10-02 11:56:01 -0500
message:
Merge returns code 1 to indicate there were conflicts.
I didn't notice because I had an older qbzr installed which suppressed
all returncodes.
=== modified file 'bzrlib/tests/blackbox/test_merge.py'
--- a/bzrlib/tests/blackbox/test_merge.py 2008-09-29 22:56:44 +0000
+++ b/bzrlib/tests/blackbox/test_merge.py 2008-10-02 16:56:01 +0000
@@ -123,7 +123,8 @@
tree, other = self.create_conflicting_branches()
# The default merge algorithm should enable 'reprocess' because
# 'show-base' is not set
- self.run_bzr('merge ../other', working_dir='tree')
+ self.run_bzr('merge ../other', working_dir='tree',
+ retcode=1)
self.assertEqualDiff('a\n'
'B\n'
'<<<<<<< TREE\n'
@@ -143,7 +144,8 @@
def test_merge_override_reprocess(self):
tree, other = self.create_conflicting_branches()
# Explicitly disable reprocess
- self.run_bzr('merge ../other --no-reprocess', working_dir='tree')
+ self.run_bzr('merge ../other --no-reprocess', working_dir='tree',
+ retcode=1)
self.assertEqualDiff('a\n'
'<<<<<<< TREE\n'
'B\n'
@@ -157,7 +159,8 @@
def test_merge_override_show_base(self):
tree, other = self.create_conflicting_branches()
# Setting '--show-base' will auto-disable '--reprocess'
- self.run_bzr('merge ../other --show-base', working_dir='tree')
+ self.run_bzr('merge ../other --show-base', working_dir='tree',
+ retcode=1)
self.assertEqualDiff('a\n'
'<<<<<<< TREE\n'
'B\n'
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
