Re: Warn before update with conflict

[Quinn Taylor]

This certainly would be a nice feature. Unfortunately, I don't believe that even Subversion itself actually provides this behavior completely. When you run `svn status` in Terminal, the 8th column (if you specify -u or --show-updates) shows whether "a newer revision exists on the server", but nothing about whether the newer version will conflict with the local version. I've had plenty of times when I updated my working copy only to realize that the update caused a slew of conflicts that I now have to sort through.

 - Quinn


On May 11, 2009, at 2:13 PM, Marijn wrote:

As annoying as the problem is, I'm not sure exactly how the feature would help. Even if you know an update will cause a conflict, you still can't commit until you update and resolve the conflict one way or another. Remember that, even when a conflict occurs and Subversion creates the 3 extra files to help sort out the conflict, your latest local version is saved in the *.mine file. You can always update back to the previous base version if desired, and just wait to update that file until later. Wish there was an easier solution, but I think it's just the nature of the beast...

Hi everybody,

I guess we all have this once in a while. Accidentally hitting update
to fetch some updates from the remote server but forgetting that there
are conflicts. This can really be annoying if you are in the process
of finishing something. I would really like it if Versions somehow
warned me if there is the possibility of conflicts between the remote
and client copy.

Thanks,

Marijn

smime.p7s
Description: S/MIME cryptographic signature