Re: [PATCH] add ability to export a specific revision when a working copy path is supplied (v2)

2017-07-18 Thread Philip Martin
Daniel Shahaf writes: > Philip Martin wrote on Tue, 18 Jul 2017 17:01 +0100: >> Committed as r1802316. Thanks! > > What do you think about backporting this to 1.9.7, Philip? While at the API > level this adds a new promise to the docstring, at the CLI level this fixes > an assertion error in a

1.10.0-alpha3 CHANGES

2017-07-18 Thread Daniel Shahaf
Hi, I'm working on CHANGES for alpha3. Could I please get a hand on the following six changes. For each of them: does it need to be listed in CHANGES? How'd you summarize the user-visible (or API-consumer-visible) change in a sentence? (In one or two case, I also wonder whether backport nomina

Re: [PATCH] add ability to export a specific revision when a working copy path is supplied (v2)

2017-07-18 Thread Daniel Shahaf
Philip Martin wrote on Tue, 18 Jul 2017 17:01 +0100: > Doug Brown writes: > > > Thanks for your feedback! That change makes perfect sense. Here is a > > second attempt at this patch that I think addresses everything you > > listed. Patch with log message is attached. > > Committed as r1802316.

Re: New conflict resolver bug in tracing history

2017-07-18 Thread Julian Foad
Stefan Sperling wrote: > Thanks for finding this, Julian! Could you please file an issue for this? https://issues.apache.org/jira/browse/SVN-4688 - Julian > I expect that we'll find several such bugs. The related path hunting code > needs thorough review and testing. It passes the tests we have

Re: svn commit: r1801970 - in /subversion/branches/shelve-checkpoint/subversion: libsvn_client/shelve.c svn/shelve-cmd.c

2017-07-18 Thread Julian Foad
Thanks for the review, Bert. I agree on all points. - Julian Bert Huijben wrote: >> + for (hi = apr_hash_first(scratch_pool, dirents); hi; hi = >> apr_hash_next(hi)) >> { > > I know it is just a prototype, but some stable sorting would be nice. >> + printf("%-30s %6d mins old %10ld

Re: New conflict resolver bug in tracing history

2017-07-18 Thread Stefan Sperling
On Tue, Jul 18, 2017 at 12:27:42PM +0100, Julian Foad wrote: > I just ran into the following bug. It appears that the conflict resolver > doesn't properly follow branch (copy) history when searching for details. > > [[[ > $ svn sw ^/subversion/branches/shelve-checkpoint3 > [...] > > $ svn merge ^

Re: [PATCH] add ability to export a specific revision when a working copy path is supplied (v2)

2017-07-18 Thread Philip Martin
Doug Brown writes: > Thanks for your feedback! That change makes perfect sense. Here is a > second attempt at this patch that I think addresses everything you > listed. Patch with log message is attached. Committed as r1802316. Thanks! -- Philip

RE: svn commit: r1801970 - in /subversion/branches/shelve-checkpoint/subversion: libsvn_client/shelve.c svn/shelve-cmd.c

2017-07-18 Thread Bert Huijben
> -Original Message- > From: julianf...@apache.org [mailto:julianf...@apache.org] > Sent: vrijdag 14 juli 2017 16:22 > To: comm...@subversion.apache.org > Subject: svn commit: r1801970 - in /subversion/branches/shelve- > checkpoint/subversion: libsvn_client/shelve.c svn/shelve-cmd.c > >

New conflict resolver bug in tracing history

2017-07-18 Thread Julian Foad
I just ran into the following bug. It appears that the conflict resolver doesn't properly follow branch (copy) history when searching for details. [[[ $ svn sw ^/subversion/branches/shelve-checkpoint3 [...] $ svn merge ^/subversion/trunk@1802151 --- Merging r1801593 through r1802151 into '.': [..