On 22.08.2011 19:23, Mark Phippard wrote:
> On Mon, Aug 22, 2011 at 1:20 PM, Stefan Küng <tortoisesvn_at_gmail.com
> <mailto:tortoisesvn_at_gmail.com>> wrote:
>
> On 22.08.2011 18:51, Neels J Hofmeyr wrote:
>
> Since TortoiseSVN has had this feature for a long time, it would
> be interesting to know what kind of edge cases people have
> raised with the
> feature. Has anyone asked that these files not be updated
> or merged?
>
>
> I've asked, but only on this list... good point, I should ask
> tortoise devs
> directly. (But their changelist is called "ignore-on-commit", so
> it's pretty
> clear what it does, I guess.)
>
>
> Apart from a few bugs in our code, we haven't had any issues with
> that special changelist. At least users haven't reported any.
> The bugs we had were related to having files in that changelist
> initially checked for commit when the commit dialog came up.
>
>
> So no one has come around asking you to block updates to this file when
> they run update? What about merge? Any problems with merged changes
> not being included in the commit? That seems like a potentially huge
> problem to me.
That feature is only to prevent commits. Users use this to keep their
local modifications from getting into the repository. It's basically
used only for config files they need to modify to suit their local paths
or setups.
So no merging.
And they still get updates if the file gets modified in the repository -
that's what they still want!
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
Received on 2011-08-22 19:28:52 CEST