Re: svn commit: r1489203 - /subversion/trunk/subversion/libsvn_client/merge.c

2013-06-04 Thread Stefan Küng
On Tue, Jun 4, 2013 at 11:36 PM, Julian Foad wrote: > Stefan Küng wrote: > > > On 04.06.2013 17:50, Julian Foad wrote: > >> Greg Stein wrote: > >>> Would "%s@%ld and %s@%ld must have a common ancestor" be easier to > >>> translate? > >>> > >>> The term "ancestrally related" seems a bit complic

Re: Media-Type for SVNPubSub

2013-06-04 Thread Greg Stein
On Sun, Jun 2, 2013 at 4:34 AM, Branko Čibej wrote: > On 02.06.2013 04:07, Ben Reser wrote: >> I was hoping someone else would weigh in here. But I guess not. >> >> On Tue, May 28, 2013 at 11:15 AM, Greg Stein wrote: >>> You guys are over-thinking it. Simply state this format is ASF-wide >>> and

Re: svn commit: r1488183 - /subversion/trunk/subversion/libsvn_client/merge.c

2013-06-04 Thread Julian Foad
Paul Burba wrote: > On Fri, May 31, 2013 at 8:02 AM,  wrote: >> URL: http://svn.apache.org/r1488183 >> >> Modified: subversion/trunk/subversion/libsvn_client/merge.c >> == >> --- subversion/trunk/subversion/libsvn_client/

Re: svn commit: r1489203 - /subversion/trunk/subversion/libsvn_client/merge.c

2013-06-04 Thread Julian Foad
Stefan Küng wrote: > On 04.06.2013 17:50, Julian Foad wrote: >> Greg Stein wrote: >>> Would "%s@%ld and %s@%ld must have a common ancestor" be easier to >>> translate? >>> >>> The term "ancestrally related" seems a bit complicated for >>> translation :-P >> >> Your suggestion is a better m

Re: Should missing smart card support not be added in the release notes?

2013-06-04 Thread Stefan Küng
On 04.06.2013 13:56, Lieven Govaerts wrote: You are referring to a configuration where OpenSSL uses MS's CryptoAPI to use the Windows certificate store. Never used it myself, but I see that TSVN has implemented this, with an extra dialog to select a client certificate if multiple were found. I s

Re: svn commit: r1489203 - /subversion/trunk/subversion/libsvn_client/merge.c

2013-06-04 Thread Stefan Küng
On 04.06.2013 17:50, Julian Foad wrote: Greg Stein wrote: Would "%s@%ld and %s@%ld must have a common ancestor" be easier to translate? The term "ancestrally related" seems a bit complicated for translation :-P Your suggestion is a better message, I agree. The present error code and error m

Re: svn commit: r1488183 - /subversion/trunk/subversion/libsvn_client/merge.c

2013-06-04 Thread Paul Burba
On Fri, May 31, 2013 at 8:02 AM, wrote: > Author: ivan > Date: Fri May 31 12:02:32 2013 > New Revision: 1488183 > > URL: http://svn.apache.org/r1488183 > Log: > Validate target working copy for mixed revisions, local modifications and > switched subtrees before contacting server. Mixed revision w

Re: Mixed revision working copy check when merging

2013-06-04 Thread Julian Foad
Ivan Zhakov wrote: > The only problem that checks for mixed revision working copy performed > at the last stage. Considering the fact that users got mixed revision > after every commit it's very annoying to wait while svn merge contacts > server, asks for merge info and etc just to show error that

Re: svn commit: r1489203 - /subversion/trunk/subversion/libsvn_client/merge.c

2013-06-04 Thread Julian Foad
Greg Stein wrote: > Would "%s@%ld and %s@%ld must have a common ancestor" be easier to > translate? > > The term "ancestrally related" seems a bit complicated for translation > :-P Your suggestion is a better message, I agree. The present error code and error message exactly duplicate one tha

Re: Should missing smart card support not be added in the release notes?

2013-06-04 Thread Ivan Zhakov
On Tue, Jun 4, 2013 at 3:56 PM, Lieven Govaerts wrote: > On Tue, Jun 4, 2013 at 1:25 PM, Ivan Zhakov wrote: >> On Tue, Jun 4, 2013 at 3:19 PM, Lieven Govaerts wrote: >>> On Tue, Jun 4, 2013 at 12:55 PM, Ivan Zhakov wrote: On Tue, Jun 4, 2013 at 2:51 PM, Lieven Govaerts wrote: > Hi, >>

Re: Should missing smart card support not be added in the release notes?

2013-06-04 Thread Lieven Govaerts
On Tue, Jun 4, 2013 at 1:25 PM, Ivan Zhakov wrote: > On Tue, Jun 4, 2013 at 3:19 PM, Lieven Govaerts wrote: >> On Tue, Jun 4, 2013 at 12:55 PM, Ivan Zhakov wrote: >>> On Tue, Jun 4, 2013 at 2:51 PM, Lieven Govaerts wrote: Hi, see subject. Serf and ra_serf don't have smart ca

Re: Should missing smart card support not be added in the release notes?

2013-06-04 Thread Lieven Govaerts
On Tue, Jun 4, 2013 at 1:25 PM, Ivan Zhakov wrote: > On Tue, Jun 4, 2013 at 3:19 PM, Lieven Govaerts wrote: >> On Tue, Jun 4, 2013 at 12:55 PM, Ivan Zhakov wrote: >>> On Tue, Jun 4, 2013 at 2:51 PM, Lieven Govaerts wrote: Hi, see subject. Serf and ra_serf don't have smart ca

Re: Should missing smart card support not be added in the release notes?

2013-06-04 Thread Ivan Zhakov
On Tue, Jun 4, 2013 at 3:19 PM, Lieven Govaerts wrote: > On Tue, Jun 4, 2013 at 12:55 PM, Ivan Zhakov wrote: >> On Tue, Jun 4, 2013 at 2:51 PM, Lieven Govaerts wrote: >>> Hi, >>> >>> >>> see subject. Serf and ra_serf don't have smart card support at this >>> moment, unlike neon. >>> >>> I'd expe

Re: Should missing smart card support not be added in the release notes?

2013-06-04 Thread Lieven Govaerts
On Tue, Jun 4, 2013 at 12:55 PM, Ivan Zhakov wrote: > On Tue, Jun 4, 2013 at 2:51 PM, Lieven Govaerts wrote: >> Hi, >> >> >> see subject. Serf and ra_serf don't have smart card support at this >> moment, unlike neon. >> >> I'd expected this to be mentioned in the release notes for 1.8.0 as >> thi

AW: AW: C++ thoughts for Berlin

2013-06-04 Thread Markus Schaber
Hi, Blair, Von: Blair Zajac [mailto:bl...@orcaware.com] > On 06/02/2013 10:53 PM, Markus Schaber wrote: > > Hi, Blair, > > Von: Blair Zajac [mailto:bl...@orcaware.com] > >>> [Discussion whether to use (part of) C++ for SVN development] > >> > >> I agree it's not worth going to C++. Where I'm comi

Re: Should missing smart card support not be added in the release notes?

2013-06-04 Thread Ivan Zhakov
On Tue, Jun 4, 2013 at 2:51 PM, Lieven Govaerts wrote: > Hi, > > > see subject. Serf and ra_serf don't have smart card support at this > moment, unlike neon. > > I'd expected this to be mentioned in the release notes for 1.8.0 as > this is not new information (at least I hope so), but I can't find

Should missing smart card support not be added in the release notes?

2013-06-04 Thread Lieven Govaerts
Hi, see subject. Serf and ra_serf don't have smart card support at this moment, unlike neon. I'd expected this to be mentioned in the release notes for 1.8.0 as this is not new information (at least I hope so), but I can't find anything about it. Lieven.

Re: serf error handling for locks without authn

2013-06-04 Thread Philip Martin
Philip Martin writes: > The code in libsvn_ra_serf/locks.c:determine_error looks dodgy: > > 213 static svn_error_t * > 214 determine_error(svn_ra_serf__handler_t *handler, > 215 svn_error_t *err) > 216 { > 217 { > 218 apr_status_t errcode; > 219 > 220 if (handler-

Mixed revision working copy check when merging

2013-06-04 Thread Ivan Zhakov
Hi, In Subversion 1.8 automatic merge doesn't allow merging to mixed revision working copy by default. This is good. The only problem that checks for mixed revision working copy performed at the last stage. Considering the fact that users got mixed revision after every commit it's very annoying t

RE: crash when merging

2013-06-04 Thread Bert Huijben
> -Original Message- > From: Julian Foad [mailto:julianf...@btopenworld.com] > Sent: dinsdag 4 juni 2013 00:13 > To: Stefan Küng > Cc: Subversion Development > Subject: Re: crash when merging > > I (Julian Foad) wrote: > > > Stefan Küng wrote: > >> SVN_ERR_W(svn_cl__check_related_sour

Re: Review of invoke-diff-cmd-feature branch

2013-06-04 Thread Gabriela Gibson
Hi, I hope I've resolved most issues, here are ones I need to ask about: Index: subversion/include/svn_client.h === --- subversion/include/svn_client.h (revision 1484305) +++ subversion/include/svn_client.h (working copy) @@ -2988,8

Re: [serf-dev] Serf issue #102 and 1.8.0 release timing

2013-06-04 Thread Peter Samuelson
[Greg Stein] > But I'll go one step further: you shouldn't care at all. > > I could release 1.2.2 tomorrow with all kinds of crap. Or maybe the > day after 1.8.0 goes final. Not much you can do about it. Subversion > needs to soak its own code, not the entire dependency stack. You could, but 1.2

AW: serf error handling for locks without authn

2013-06-04 Thread Markus Schaber
Hi, Von: Philip Martin [mailto:philip.mar...@wandisco.com] > Greg Stein writes: > > On Mon, Jun 3, 2013 at 5:14 PM, Philip Martin > > wrote: > >> http://subversion.tigris.org/issues/show_bug.cgi?id=4368 > >> Locking with anonymous http fails because there is no username. At > > That should be a