[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: Rob Hubbard <Rob.Hubbard_at_celoxica.com>
Date: 2007-01-29 11:31:12 CET

Hello Lakshman,

Beyond Compare is indeed an excellent product (like Victor, I am a "very happy customer"). It is not capable of 3-way diff or merge operations, however.

For platforms including Linux and Windoze, you might wish to try the free/open "KDiff3" <http://kdiff3.sourceforge.net/>. I seem to remember that it (optionally) integrates itself with Tortoise too, so my only caution would be to make a note of your Tortoise diff and merge tool settings before installing KDiff3 on Windoze. (I use Beyond Compare for 2-way diff, but KDiff3 for merge or 3-way diffs.)

Rob.

> -----Original Message-----
> From: Srilakshmanan, Lakshman
> [mailto:Lakshman.Srilakshmanan@tradingpost.com.au]
> Sent: 29 January 2007 01:00
> To: Victor A. Wagner Jr.
> Cc: users@subversion.tigris.org
> Subject: RE: ignore keyword substitution during merge
>
>
> 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
>
>
> _____________________________________________________________________
> This incoming message has been checked for all known viruses
> by the Messagelabs Scanning System, on behalf of Celoxica Ltd.
>

_____________________________________________________________________
This message has been checked for all known viruses by the MessageLabs Virus Scanning Service, on behalf of Celoxica Ltd.

This email and any files transmitted with it are confidential and
may be legally privileged. It is intended solely for the use of the
individual or entity to whom it is addressed. If you have received
this in error, please contact the sender and delete the material
immediately. Whilst this email has been swept for viruses, you
should carry out your own virus check before opening any
attachment. Celoxica Ltd accepts no liability for any loss or
damage which may be caused by software viruses or interception
or interruption of this email.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 29 11:32:19 2007

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