-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi All,
While reviewing r30464 for backport to 1.5.x. I expected a conflict as
it depended on r30448 which is not yet merged.
1.5.xWC$ svn merge -c30464 http://svn.collab.net/repos/svn/trunk
No conflict.
This merges only subversion/libsvn_client/merge.c *not*
subversion/tests/cmdline/merge_tests.py
<snip of r30464 subversion/tests/cmdline/merge_tests.py>
- --- trunk/subversion/tests/cmdline/merge_tests.py (revision 30463)
+++ trunk/subversion/tests/cmdline/merge_tests.py (revision 30464)
@@ -4305,8 +4305,6 @@
expected_status)
os.chdir(saved_cwd)
- - # Marked as XFail until
- - # http://subversion.tigris.org/issues/show_bug.cgi?id=2821#desc22 is
fixed.
def avoid_repeated_merge_on_subtree_with_merge_info(sbox):
"use subtree's mergeinfo to avoid repeated merge"
# Create deep trees A/B/F/E and A/B/F/E1 and copy A/B to A/copy-of-B
@@ -10881,7 +10879,7 @@
merge_conflict_markers_matching_eol,
merge_eolstyle_handling,
avoid_repeated_merge_using_inherited_merge_info,
- - XFail(avoid_repeated_merge_on_subtree_with_merge_info),
+ avoid_repeated_merge_on_subtree_with_merge_info,
obey_reporter_api_semantics_while_doing_subtree_merges,
SkipUnless(mergeinfo_inheritance,
server_has_mergeinfo),
</snip>
Our 'libsvn_diff' merge code considers the following diff as *ALREADY
MERGED* scenario and hence it does *not fail with conflict*.
I agree with this intelligent behavior of 'libsvn_diff' merge.
I understand 'merge need not be logically correct' too.
But would prefer some switch/option to our diff engine to behave
non-intelligently.
What abt '-x --strict' to turn-off this intelligence?
With regards
Kamesh Jayachandran
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFH/erJ3WHvyO0YTCwRArnTAJ0VBYmDcDT0KAmJTK3DlyZPCbtTLACeLfEi
Q3wXFcrwfpP6qImRUPNhMSs=
=8bhv
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-04-10 12:26:36 CEST