You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Ch...@qimonda.com on 2006/10/16 20:14:57 UTC
OT: SVK mailing list?
Sorry for the OT, but is there an SVK mailing list? The
only I found on the Svk page does NOT seem to be active.
--------------------------------------
Chris T Fouts
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: OT: SVK mailing list?
Posted by Adrian Howard <ad...@quietstars.com>.
On 17 Oct 2006, at 11:37, Binh, Tran Son wrote:
> Do they have any mailing list for end user?
Nope - but questions are welcome on the devel list. I would imagine
that a user list will split off at some point as the traffic warrants.
Adrian
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: OT: SVK mailing list?
Posted by "Binh, Tran Son" <bi...@inrialpes.fr>.
Do they have any mailing list for end user?
On Tuesday 17 October 2006 10:09, Adrian Howard wrote:
> On 16 Oct 2006, at 21:14, <Ch...@qimonda.com>
>
> <Ch...@qimonda.com> wrote:
> > Sorry for the OT, but is there an SVK mailing list? The
> > only I found on the Svk page does NOT seem to be active.
>
> If you're talking about svk-devel@bestpractical.com - not active in
> what way?
>
> Got some mail from it this very morning :)
>
> Adrian
>
> ---------------------------------------------------------------------
> 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: Disabling the auto-merging feature
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Jun 12, 2007, at 05:20, Thompson, Graeme (AELE) wrote:
> We have recently noticed that SVN will auto-merge non-conflicting
> changes.
>
> We would prefer the behaviour that SVN does not auto-merge file, but
> simply leaves them in a conflicted state so that the proposed merge
> has
> to be checked manually. This issue has arisen through some files that
> people were changing that are text based, but should not be auto
> merged.
>
> We have set the svn:mime-type=application/octet-stream property on all
> files that this is an issue with and this provides the desired
> behaviour
> of leaving all files that would have been auto-merged in a conflicted
> state, making it obvious to the developer that there are changes that
> need checking, but this seems to give us problems with SVN blame where
> it complains that it can't diff binary files!
>
> Does anyone know a way of disabling the auto-merge feature of svn
> update
> without setting the svn:mime-type property?
http://svn.haxx.se/users/archive-2005-10/1021.shtml
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Disabling the auto-merging feature
Posted by "Thompson, Graeme (AELE)" <Gr...@smiths-aerospace.com>.
Hi,
We have recently noticed that SVN will auto-merge non-conflicting
changes.
We would prefer the behaviour that SVN does not auto-merge file, but
simply leaves them in a conflicted state so that the proposed merge has
to be checked manually. This issue has arisen through some files that
people were changing that are text based, but should not be auto merged.
We have set the svn:mime-type=application/octet-stream property on all
files that this is an issue with and this provides the desired behaviour
of leaving all files that would have been auto-merged in a conflicted
state, making it obvious to the developer that there are changes that
need checking, but this seems to give us problems with SVN blame where
it complains that it can't diff binary files!
Does anyone know a way of disabling the auto-merge feature of svn update
without setting the svn:mime-type property?
Thanks,
Graeme
************************************************
The information contained in, or attached to, this e-mail, may contain confidential information and is intended solely for the use of the individual or entity to whom they are addressed and may be subject to legal privilege. If you have received this e-mail in error you should notify the sender immediately by reply e-mail, delete the message from your system and notify your system manager. Please do not copy it for any purpose, or disclose its contents to any other person. The views or opinions presented in this e-mail are solely those of the author and do not necessarily represent those of the company. The recipient should check this e-mail and any attachments for the presence of viruses. The company accepts no liability for any damage caused, directly or indirectly, by any virus transmitted in this email.
************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: OT: SVK mailing list?
Posted by Jean Jordaan <je...@gmail.com>.
> If you're talking about svk-devel@bestpractical.com - not active in
> what way?
I guess they're talking about the OpenFoundry one, still referenced from
http://svk.bestpractical.com/view/SVKFAQ
I'm going to update that wiki page as soon as my 'net connection allows,
and the server stop returning an "Internal Server Error" for the "edit"
link.
--
View this message in context: http://www.nabble.com/OT%3A-SVK-mailing-list--tf2454925.html#a11076187
Sent from the Subversion Users mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: OT: SVK mailing list?
Posted by Adrian Howard <ad...@quietstars.com>.
On 16 Oct 2006, at 21:14, <Ch...@qimonda.com>
<Ch...@qimonda.com> wrote:
> Sorry for the OT, but is there an SVK mailing list? The
> only I found on the Svk page does NOT seem to be active.
If you're talking about svk-devel@bestpractical.com - not active in
what way?
Got some mail from it this very morning :)
Adrian
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org