[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: Sean Laurent <sean_at_neuronfarm.com>
Date: 2005-03-25 17:30:02 CET

On Friday 25 March 2005 09:22 am, Manuel VACELET wrote:
> 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"

Perforce takes an interesting approach to this which I found rather useful: it
allows you to group your changes into different changesets. You always have
a 'default' changeset, but you can easily create new changesets.

Although Perforce follows the modify/merge paradigm for the most part, you
always have to ask the server for permission to edit a file (this prevents
you from editing a file someone else has an exclusive on). When you
explicitly ask to edit the file, you can choose to put the file in the
default changeset or into a specific changeset.

When you go to commit, the same rules apply; by default, Perforce commits the
files in the default changeset. If you want to commit one of the other
changesets you created, you have to explicitly tell Perforce to do that.

This easily solves Manuel's problem. Create a new changeset (call it
'custom_htaccess'), assign the customized .htaccess file to the new changeset
and voila. Unless you specifically request to commit the 'custom_htaccess'
changeset, the files in that set will _never_ be committed.

Although Subversion does not lend itself quite as well to this idea, I still
think it could be implemented. It would be easiest to utilize this idea in a
GUI client, given the ability to drag/drop files. I would still love to see
something similar in the commandline client, although I think it might be
tricky... if not impossible.

Any thoughts?

-Sean
------------------------------
And you thought we couldn't make it worse.
------------------------------

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 25 17:32:31 2005

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