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

RE: ignore conflict option?

From: Miller, Eric <Eric.Miller_at_amd.com>
Date: 2007-07-12 16:39:07 CEST

Yes, they must be checked in. They are generated files created by an
interactive application. Unfortunately the files are shared by various
pieces of the "real" source data and the operations that trigger
creation and modification of these files is not well known.

Basically I just want to auto-resolve by keeping the local version. I
also don't want update creating foo.rXXXX, foo.mine, etc. files every
time there is a conflict on these particular shared files.

Eric

> -----Original Message-----
> From: Talden [mailto:talden@gmail.com]
> Sent: Thursday, July 12, 2007 2:15 AM
> To: Miller, Eric
> Cc: users@subversion.tigris.org
> Subject: Re: ignore conflict option?
>
> Should the files be checked in at all - can they be generated as part
> of the build process and not versioned (since the source material is
> versioned already).
>
> --
> Talden
>
> On 7/12/07, Miller, Eric <Eric.Miller@amd.com> wrote:
> > Can anyone tell me if there is a way to modify the way conflicts are
> > handled for particular files?
> >
> > I have run into a situation where auto-generated binary files are
> > creating conflicts between working copies. It isn't practical to
> > require locks on these files and all I really want is to check in
> > regardless of conflict - whatever is in the working copy wins, more
or
> > less.
> >
> > Is there a property or switch that I can set that would disable
conflict
> > awareness for some files?
> >
> > Thanks,
> >
> > Eric
> >
> >
> >
---------------------------------------------------------------------
> > To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> > For additional commands, e-mail: users-help@subversion.tigris.org
> >
> >
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 12 16:39:00 2007

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