[PATCH]: Fix issue #4128
From: Markus Schaber <m.schaber_at_3s-software.com>
Date: Mon, 11 Jun 2012 12:32:20 +0000
Hi,
See attached a patch to fix issue #4128: If the incoming file is identical to the existing, locally modified file, we don't flag a conflict any more, but notify the user of a successful merge.
[[[
[ insubversion/libsvn_wc ]
* merge.c
]]]
Thank you,
Index: subversion/libsvn_wc/merge.c
return SVN_NO_ERROR;
*merge_outcome = svn_wc_merge_no_merge;
|
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.