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

Re: Exclude files from update's automerge?

From: Gregory Piņero <gregpinero_at_gmail.com>
Date: 2005-12-07 18:25:10 CET

This post may point you in the right direction:

http://www.blendedtechnologies.com/how-to-turn-off-auto-merge-in-subversion/33

-Greg

On 12/7/05, Brent Webster <brent.webster@liquidcomputing.com> wrote:
>
> We are using ILogix's Rhapsody (UML) toolset which generates various ascii
> text source files which have been checked into Subversion. This toolset has
> its own DiffMerge tool (GUI based only) that must be used to merge revisions
> of the source. Is there a property or something that can inform 'svn
> update' not to check for differences?
>
> If there isn't an ignore capability then I'm left wondering how other folks
> handle this type of problem
>
> ---
> Thanks, Brent

--
Gregory Piņero
Chief Innovation Officer
Blended Technologies
(www.blendedtechnologies.com)
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 7 18:28:25 2005

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