From: David K. <dk...@sy...> - 2009-02-23 16:55:03
|
Upon review, I think what a merge program should do in this case is at best undefined. For some people performing the merge is correct and for others performing the copy is correct. That is why I was requesting an option setting. Also for us, performing a manual per-file operation is not practical, as we may have 100's of modules in this same mode. As of right now, this is not a big issue, as we have changed our internals processing to better handle this situation. From: Joachim Eibl [mailto:joa...@gm...] Sent: Sunday, February 22, 2009 7:47 AM To: kdi...@li... Subject: Re: [Kdiff3-user] Request to make a change in functionality an option Hi David, > Version 0.9.94 - 2009/01/17 > =========================== > - Directory merge: Default op for change in either B or C and delete in the > other is now merge (previously copy). > > This has turned out to be an issue for one of our processes, as we were > relying on the copy function in this case. Can this change in > functionality be made into a controllable option? I see. I tried to solve this issue: https://sourceforge.net/tracker/index.php?func=detail&aid=2017308&group_id=58666&atid=488548 Obviously I underestimated possible problems. Would it improve the situation, if KDiff3 would set an error for such a file, so that when the user starts the merge then she/he will be warned and the merge would not start until the user specified what operation would be preferred? Only if this is not sufficient, then I could also add an option. Joachim NOTICE: This electronic mail message and any files transmitted with it are intended exclusively for the individual or entity to which it is addressed. The message, together with any attachment, may contain confidential and/or privileged information. Any unauthorized review, use, printing, saving, copying, disclosure or distribution is strictly prohibited. If you have received this message in error, please immediately advise the sender by reply email and delete all copies. |