[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:00:13 CET

Martin J. Stumpf wrote:
>
>
> Manuel VACELET wrote:
>
>> Hello,
>>
>> Is there any way to mark a file as locally ignored?
>>
>> For instance, I have a file in my working copy, modified for local
>> reasons. I don't want to commit this file because this is my WC that
>> have a problem and require a specific hack.
>
> This sounds like a perfect opportunity for a private branch to me.
> If you don't want to commit then you must have the trunk and you are
> probably following the reccomendation that all trunk commits should
> build. So, cp the trunk to a branch and you can do anything you want
> with it. Merge back to trunk the changes that belong there and then
> forget your branch.
>
> Hope this helps

In fact ... you are right. I'm already working on my private branch and
then, I can commit without any problems.

More generally this issue can always be solved by using branches.

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

-- 
# VACELET Manuel     manuel.vacelet-abecedaire(at)st(dot)com #
# STMicroelectronics - HPC/STS                               #
---------------------------------------------------------------------
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:02:57 2005

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