You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by "Miller, Eric" <Er...@amd.com> on 2007/07/11 20:27:25 UTC
ignore conflict option?
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
Re: ignore conflict option?
Posted by Erik Huelsmann <eh...@gmail.com>.
On 7/12/07, Miller, Eric <Er...@amd.com> wrote:
> 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.
A feature like that has landed on trunk just last week. It's a
per-update switch though (ie not per file)...
HTH,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: ignore conflict option?
Posted by "Miller, Eric" <Er...@amd.com>.
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 <Er...@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
Re: ignore conflict option?
Posted by Talden <ta...@gmail.com>.
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 <Er...@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