How to deal with files that are relevant to version control, but that frequently change in irrelevant ways?

Posted by Jens Mühlenhoff on Stack Overflow See other posts from Stack Overflow or by Jens Mühlenhoff
Published on 2011-11-18T09:46:41Z Indexed on 2011/11/18 9:50 UTC
Read the original article Hit count: 234

Filed under:

delphi

|

git

|

svn

|

version-control

.dproj files are essential for Delphi projects, so they have to be under version control.

These files are controlled by the IDE and also contain some information that is frequently changed, but totally irrelevant for version control.

For example: I change the start parameters of the application frequently (several times a day), but don't want to accidently commit the project file if only the part dealing with the start parameters has changed.

So how to deal with this situation?

A clean solution would be to take the file apart, but that isn't possible with the Delphi IDE AFAIK.

Can you ignore a specific part of a file?

We're using Subversion at the moment, but may migrate to Git soon.

© Stack Overflow or respective owner

Related posts about delphi

TVirtualStringTree compatibility between Delphi 7 and Delphi 2010 - 'Parameter lists differ'

as seen on Stack Overflow - Search for 'Stack Overflow'
Hi, I've made a form containing a TVirtualStringTree that works in Delphi 7 and Delphi 2010. I notice that as I move between the two platforms I get the message '...parameter list differ..' on the tree events and that the string type is changing bewteen TWideString (D7) and string (D2010). The only… >>> More
Convert Delphi 7 code to work with Delphi 2009

as seen on Stack Overflow - Search for 'Stack Overflow'
I have a String that I needed access to the first character of, so I used stringname[1]. With the unicode support this no longer works. I get an error: [DCC Error] sndkey32.pas(420): E2010 Incompatible types: 'Char' and 'AnsiChar' Example code: //vkKeyScan from the windows unit var KeyString:… >>> More
Book recommendation for moving from Delphi 6 to Delphi 2010

as seen on Stack Overflow - Search for 'Stack Overflow'
Hi, I am a long time Delphi 6 developer. Looking for a book on Delphi 2010. Not only on the new features available in Delphi 2010, but more importantly, guideline on how different it is to develop applications in Delphi 2010, the architecture, standard and convention, etc. Thanks a lot. >>> More
Compile Delphi component package (bpl) for different Delphi versions

as seen on Stack Overflow - Search for 'Stack Overflow'
Hello. The situation is the following. Typically I use RAD Studio 2010 for Delphi development. I have some components I would like to redistribute in binary form (*.bpl without source). But I would like people to be able to use them despite of their Delphi version. But, for example, dcu files can… >>> More
Delphi Speech recognition delphi

as seen on Stack Overflow - Search for 'Stack Overflow'
I need create a programatic equivalent using delphi language... or could someone post a link on how to do grammars in peech recogniton using the delphi. sorry for my english... XML Grammar Sample(s): <GRAMMAR>  <RULE NAME="HelloWorld"… >>> More

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

as seen on Stack Overflow - Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server. My cent 6.3 vm gets a 401 error git clone https://git.acme.com/git/torque-setup "error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs As a work… >>> More
Can't install git on Ubuntu 12.10

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop: http://git-scm.com/download/linux When I do: $ sudo apt-get install git-core This is what my terinal shows: Reading package lists... Done Building dependency tree Reading state information... Done The following packages… >>> More
Git apache : unable to push via http

as seen on Server Fault - Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn). svn support works well, but I have some trouble with git. Actual configuration: CentOS 5 Apache 2.2.8 Git 1.7.4.1 The /etc/httpd/conf/httpd.conf content: ServerTokens OS ServerRoot "/etc/httpd" PidFile run/httpd… >>> More
git on HTTP with gitolite and nginx

as seen on Server Fault - Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S). I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference). I have searched the whole afternoon and I think I'm stuck. I have think I have understood that nginx needs fcgiwrap… >>> More
Redmine git integration - issue in accessing git from redmine but not from external git client

as seen on Server Fault - Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I… >>> More