> 2 - Warn when merge happens !!
> It brought with some surprise !!
> SVN does it, but does not warns (except it sends a message
> telling so), would it be possible to have a warning when this happens
?
> If you don't want automatic merging, set the svn:mime-type property to
> something other than text (e.g. application/octet-stream).
> Imagine for a moment what you're asking here:
> * user starts updating a big working copy
> * about 50 files got modified, 10 of those are modified by the user
> himself too
> * during the update, a dialog pops up 10 times warning about a merge
> The only thing you would get with that: users complaining. And after
the
> third dialog, users won't even read the dialog box anymore but simply
> click ok to get rid of it.
> It wouldn't help at all - it would only hurt.
> <Vincent>
> I disagree with your last point, people, and developpers especially
don't like the
> idear of having someone modifying their code without telling. Merge
without at least telling
> is something people dislike.
> Therefore it would not hurt, simply because merging should be
something quite unusual, which
> happens not so often. But as it is one of the basic principles of svn
(opposingly to locking), I
> would have imagined something telling about it.
> </Vincent>
I am in agreement with Vincent here somewhat. I have just posted to the
user mailing about trying to undo an Update. Thing is that I updated ,
and an automatic merged occurred which is great but not what I wanted in
this instance. Instead I wanted to branch (for argument sake) my
previous revision. Automatically merging without a prompt is sometimes
good and sometimes bad. I can see both sides of the fence. How always
having a prompt which could prompt for a merge when the first merge was
encountered, which has the following buttons:
1. Yes - which when selected merges the file and will prompt the user on
the next merge occurrence.
2. No - which when selected does not merge the file and will prompt the
user on the next merge occurrence.
3. Yes to All - which when selected merges the current file and all
future files.
4. No to All - which when selected does not merge this file or any other
future files.
These are just thoughts but if an alternate solution is available I
would be happy with that. At the moment I am a bit lost as to how to
achieve this functionality.
Thanks
Scott Nicolson
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Feb 13 01:00:30 2007