RE: Re: [Subclipse-users] Subclipse creating .edited file after merge conflict

SVN Status only shows the one text conflict:

minastirith:subclipse-test ioeth$ svn status
C foo.txt
? foo.txt.mine
? foo.txt.r19628
? foo.txt.r19629
? foo.txt.edited
Summary of conflicts:
  Text conflicts: 1

When I issue the svn update command via command line instead of through Subclipse, the foo.txt.edited file is not generated. Additionally, it does not get created when I edit the conflict and resolve the file back in Eclipse from there either.

I'm not sure what the problem with reproduction might be. Each time I initiate Update to Head via Subclipse, the foo.txt.edited file is created immediately after the update, before I edit the conflict in order to resolve it.

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3026418

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2012-11-06 21:23:15 CET