Svn resolves conflict in Cygwin
Since I have upgraded one of my workstations to SVN 1.7.2 client, whenever I resolve the conflict, the svn client hangs endlessly when I start the Cygwin shell.
This is what I mean ...
$ svn update
Updating '.':
U WEB-INF\src\drOps\TaskasaurusCoCPITServer.java
U WEB-INF\src\drOps\TaskarooControlService.java
U WEB-INF\src\log4j.properties
Conflict discovered in 'C:/data/tomcat/active/drOps/WEB-INF/classes/drOps/TaskasaurusCoCPITServer.class'.
Select: (p) postpone,
(mf) mine-full, (tf) theirs-full,
(s) show all options: mf
After choosing any option (mf, tf, p, or any of the options available after choosing s), the svn client hangs constantly. I have to control + c from it.
Has anyone seen this behavior and knows what might be causing it?
OS = Windows 7 Starter (32 bit)
Subversion client version = 1.7.2
source to share
For those still looking for a solution to this:
Conflict resolution will not work on Cygwin with the Windows Subversion client. You need to use Cygwin's own Subversion package. Run the Cygwin installer , install the "subversion" package.
After that, everything should work fine.
Hope it helps.
source to share