>>> On Fri, Apr 27, 2007 at 9:30 am, justinjohnson@gmail.com wrote:
> Wrapping up client commands isn't really an option for me. There are
> too many clients to make this feasible (command line, TortoiseSVN, IDE
> plugins).
If we do that we'll have to train our people
to use the command line only for merges; in our case this seems
possible.
> I wrote a script that parses revisions from the log and determines if
> a rename happened. It seems like svnmerge.py should be able to detect
> when something was renamed and make sure changes aren't lost. It may
> require asking the user which file/directory should be kept (i.e. what
> history to preserve) and then it can merge the lost changes into that
> file/directory.
What is the reliable logic to determine if a rename happened? Like
if a directory (java package) is renamed, or if there are other adds
& deletes at the same time? I didn't see a way but if it works, then
modifying svnmerge.py sounds attractive.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Apr 27 17:59:38 2007