[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Mark a file as locally ignored

From: Manuel VACELET <manuel.vacelet-abecedaire_at_st.com>
Date: 2005-03-25 16:22:28 CET

Martin J. Stumpf wrote:
>
>>
>> But sometimes you won't create a private branch for ridiculous reasons
>> (here, I commented 2 lines in a .htaccess file beacause my local
>> apache do not provide a module).
>> I know Subversion manage very well branches with cheap copies, etc.
>> But in my case, If I'm working on trunk, I won't create a branch just
>> for 2 lines (because I have to merge to retreive modifications made by
>> other users, etc.).
>>
>> I'm not very clear :)
>>
>> Sometimes branches are not the best solution.
>>
>> Manuel
>>
> I know what you mean with just one file or just two lines. How abut
> copying the file to a new name, copying your Makefile also, then you can
> build (temporarily) with the one you are working on. That way the svn ci
> will only flag the file with a '!'.

Good idea but unfortunatly in my case the '.htaccess' is a mandatory
filename for apache, I can't rename it.

After speaking with other developers around my it seems that this
feature could be very useful for many people.

In fact, this is not exactly the same paradigm than branches.

 From my point of view, create a branch mean "I start a new development,
and I don't want annoy other developers".

And my 'required feature' mean "I temporary need to edit a file for
local purpose but these modifications will never be commited into the
repository"

Manuel

-- 
# VACELET Manuel     manuel.vacelet-abecedaire(at)st(dot)com #
# Tel:  042 6089                          +33 (0)476 92 6089 #
# STMicroelectronics - HPC/STS                               #
# 850, rue Jean Monet - 38926 CROLLES CEDEX - FRANCE         #
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 25 16:25:10 2005

This is an archived mail posted to the Subversion Users mailing list.