If I am interpreting your message correctly, you want a means to use
SVN to push out certain files via update, but not allow local changes
to be committed. But you still want to allow local changes, and want
to use update's auto-merge functionality to "blend" the "master
changes" with the local changes - all without the user needing to do
And you want to avoid scripting.
Your requested "ignore on commit" feature might allow avoiding
scripting, however, there is always the possibility of conflicts
between "master" and local changes, which will require user action.
Unless these files are only changed by an application that somehow
guarantees that local changes won't conflict with the master changes,
you can not avoid this.
Your "ignore on commit" feature might be possible, however, that would
be a core SVN change, rather than TSVN. TSVN is a front end to SVN. As
I recall, SVN is now an Apache project, so you can find where to post
your request at apache.org
On Mon, Nov 1, 2010 at 11:40 AM, Jaap Taal <jaap_at_q42.nl> wrote:
> What I forgot to point out:
> With all of the suggested workarounds, all checkouts need to be configured before they work, so a user action is needed, if there are lot's of files (like env configs, but also mock database files (e.g. sqlite)) you need a readme.txt...
> We want to avoid this without scripting everyting. Also we want to apply this "auto ignore-on-commit" to existing project, so tailoring our software towards svn (which is a bad idea) is something we can't do...
> Right now we have a list of templates to copy, but when somebody updates the template nobody get's noticed automatically, whilst having the ignore on commit can actually merge incoming (new settings) with your changed config.
> So ignore-on-commit is ideal, but not automatic (you need to know which files to add to ignore on commit).
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-11-02 15:09:47 CET