Re: Warn before update with conflict

[Quinn Taylor]

View > Show Updates From Repository (⇧⌘U)
View > File Browser Columns > Data Status In Repository



 - Quinn

On May 14, 2009, at 2:03 AM, dain wrote:

Just be aware that it will slow down refreshes of the local status. One of the nice things about SVN is that the local working copy stores a copy of the base revision, so `svn status` doesn't require network access — unless you specifically check against the server. It's not Versions being slow, it's just an inherent downside to hitting the SVN server. However, the convenience of seeing updates on the server might outweigh the cost... :-)

how about marking the files in the folder structure which have newer
versions?

the same way as with local changes, just the other way around? so you
would have a visual clue that which files will change on an update

On May 11, 11:22 pm, Quinn Taylor <quinntay...@mac.com> wrote:

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.

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.


the beast...

  - Quinn

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

Wish there was an easier solution, but I think it's just the nature of

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

and client copy.

warned me if there is the possibility of conflicts between the remote

Thanks,

Marijn

 smime.p7s
3KViewDownload

--~--~---------~--~----~------------~-------~--~----~

To post to this group, send email to versions@googlegroups.com
To unsubscribe from this group, send email to 
versions+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en
-~----------~----~----~----~------~----~------~--~---

You received this message because you are subscribed to the Google Groups "Versions" group.

smime.p7s
Description: S/MIME cryptographic signature