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

RE: ignore keyword substitution during merge

From: Srilakshmanan, Lakshman <Lakshman.Srilakshmanan_at_tradingpost.com.au>
Date: 2007-01-29 02:00:02 CET

Hi Victor,

Thanks for your suggestion. I will look into using that on windows based
clients.
Any idea of a tool for a Linux/Unix based client ?

Thanks
Lakshman

> -----Original Message-----
> From: Victor A. Wagner Jr. [mailto:vawjr@rudbek.com]
> Sent: Monday, 29 January 2007 11:55 AM
> To: Srilakshmanan, Lakshman
> Subject: Re: ignore keyword substitution during merge
>
> At 16:22 2007-01-28, you wrote:
> >Hi All,
> >
> >I currently have svn:keywords properties enabled on all my projects.
I
> >also ensure that the developers include HeadURL, Author, Revision and
> >Date in their source code for keyword substitution.
> >
> >During repeated merge, files with svn:keywords modification are,
also,
> >identified as "modified files".
> >
> >I know this is the expected behaviour, but I was wondering if there
was
> >a "ignore svn:keyword" or a ignore "regexp" functionality that I
could
> >use to inform the merge tool to ignore changes in files that are
> >associated with "svn:keywords" or those that meet the "regexp".
> >
> >Your thoughts & feedback are greatly appreciated.
>
> convince it to use "Beyond Compare 2" as the merge tool
>
>
> >Thanks
> >Lakshman
> >
> >---------------------------------------------------------------------
> >To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> >For additional commands, e-mail: users-help@subversion.tigris.org
>
> Victor A. Wagner Jr. http://rudbek.com
> The five most dangerous words in the English language:
> "There oughta be a law"
>
> I am not affiliated with the authors of Beyond Compare 2 other than
> as a very happy customer.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 29 02:01:15 2007

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