svn diff command line tool bug

2012-05-10 Thread asdfasd asdfasdf
Hello! I have encountered a bug I was trying to get list of all changed files diff between 1rst revision and 2nd revision using following command: svn.exe diff --revision 1:2 --summarize "https://domain:port/svn/my_repo_name/plugins/myPluginName"; A https://domain:port/svn/my_repo_name/plugi

Re: 1.7.5 candidates

2012-05-10 Thread Paul Burba
On Thu, May 10, 2012 at 3:49 PM, Philip Martin wrote: > Subversion 1.7.5 tarballs are now available for testing/signing by > committers. To obtain them please check out a working copy from > https://dist.apache.org/repos/dist/dev/subversion SUMMARY: - +1 to release VERIFIED: - Ot

Re: svn commit: r657 - in /dev/subversion: subversion-1.7.5.tar.bz2.asc subversion-1.7.5.tar.gz.asc subversion-1.7.5.zip.asc

2012-05-10 Thread Greg Stein
On May 10, 2012 1:51 PM, "Philip Martin" wrote: > > s...@apache.org writes: > > > Author: stsp > > Date: Thu May 10 22:27:49 2012 > > New Revision: 657 > > > > Log: > > Remove binary svn:mime-type from 1.7.5 .asc signature files, and set their > > eol-style to 'native'. See http://svn.haxx.se/dev/

Re: svn commit: r658 - in /dev/subversion: subversion-1.7.5.tar.bz2.asc subversion-1.7.5.tar.gz.asc subversion-1.7.5.zip.asc

2012-05-10 Thread Hyrum K Wright
Tested on Ubuntu 12.04, fsfs x {neon,serf,local,svn}, swig-{pl,py,rb}, javahl. All tests passed. -Hyrum On Thu, May 10, 2012 at 8:08 PM, wrote: > Author: hwright > Date: Fri May 11 01:08:12 2012 > New Revision: 658 > > Log: > Add signatures for 1.7.5. > > Modified: >    dev/subversion/subversi

Re: svn commit: r657 - in /dev/subversion: subversion-1.7.5.tar.bz2.asc subversion-1.7.5.tar.gz.asc subversion-1.7.5.zip.asc

2012-05-10 Thread Philip Martin
s...@apache.org writes: > Author: stsp > Date: Thu May 10 22:27:49 2012 > New Revision: 657 > > Log: > Remove binary svn:mime-type from 1.7.5 .asc signature files, and set their > eol-style to 'native'. See http://svn.haxx.se/dev/archive-2012-04/0227.shtml The files already had 'native' svn:eol-s

Re: svn commit: r1336929 - in /subversion/trunk/subversion: include/private/svn_wc_private.h include/svn_wc.h libsvn_client/resolved.c libsvn_wc/conflicts.c svn/conflict-callbacks.c svn/main.c svn/res

2012-05-10 Thread Greg Stein
Should On May 10, 2012 12:28 PM, wrote: > > Author: stsp > Date: Thu May 10 22:28:13 2012 > New Revision: 1336929 > > URL: http://svn.apache.org/viewvc?rev=1336929&view=rev > Log: > Make 'svn resolve' invoke the interactive conflict resolution callback > for all conflicted paths in the working cop

Re: 1.7.5 candidates

2012-05-10 Thread Philip Martin
Philip Martin writes: > You can use the release.py script for this: > release.py sign-candidates --target /path/to/dist/dev/subversion/wc 1.7.5 > which is the equivalent of running the following command for each > tarball: > gpg -ba -f - subversion-1.6.18.tar.bz2 >> subversion-1.6.18.tar.bz2.as

1.7.5 candidates

2012-05-10 Thread Philip Martin
Subversion 1.7.5 tarballs are now available for testing/signing by committers. To obtain them please check out a working copy from https://dist.apache.org/repos/dist/dev/subversion Please add your signatures to the .asc files there. You can use the release.py script for this: release.py sign-cand

Re: svn commit: r1335639 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c

2012-05-10 Thread C. Michael Pilato
On 05/10/2012 06:21 AM, Ivan Zhakov wrote: > It seems that ra_serf unconditionally retrieves properties using > PROPFIND for *all* added files: Yup, that's what I said. :-) > subversion\libsvn_ra_serf\update.c:1633 (start_report) > [[[ > else if ((state == OPEN_DIR || state == ADD_DIR) && >

Re: Two-phase merge

2012-05-10 Thread Julian Foad
On 29 April, Stefan Fuhrmann wrote: > Julian Foad wrote: >> Stefan Fuhrmann wrote: >>> [...] The proposal I make here is not >>> an alternative to e.g. "Symmetric Merge" but rather a >>> refined merge strategy that would also benefit the current >>> merge. [...] >>> In end, we will always merge ind

Re: svn commit: r1336128 - in /subversion/trunk/subversion/bindings/javahl: native/ src/org/apache/subversion/javahl/

2012-05-10 Thread Stefan Sperling
On Wed, May 09, 2012 at 11:57:29PM -0400, Greg Stein wrote: > On Wed, May 9, 2012 at 10:07 AM, Stefan Sperling wrote: > > The parameter is new in 1.8. The ignoreProps parameter is new in 1.8, too, > > and I modeled my changes on those that added the ignoreProps parameter. > > > > So I suppose this

Re: svn commit: r1335639 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c

2012-05-10 Thread Ivan Zhakov
On Wed, May 9, 2012 at 8:51 PM, C. Michael Pilato wrote: > On 05/08/2012 05:47 PM, Ivan Zhakov wrote: >> On Wed, May 9, 2012 at 1:34 AM, Ivan Zhakov wrote: >>> On Wed, May 9, 2012 at 12:49 AM, C. Michael Pilato >>> wrote: On 05/08/2012 04:39 PM, Mark Phippard wrote: > On Tue, May 8, 20

Re: svn commit: r1336413 - /subversion/trunk/tools/dist/release.py

2012-05-10 Thread Daniel Shahaf
phi...@apache.org wrote on Wed, May 09, 2012 at 21:36:23 -: > +subparser.add_argument('--username', default=getpass.getuser(), > +help='''Username for ''' + dist_repos + '''. The default > +is the current username''') I think the default sho

Re: svn commit: r1336475 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_client/client.h subversion/libsvn_client/externals.c subversion/libsvn_client/status.c

2012-05-10 Thread Daniel Shahaf
Bert Huijben wrote on Thu, May 10, 2012 at 10:26:18 +0200: > > > > -Original Message- > > From: svn-r...@apache.org [mailto:svn-r...@apache.org] > > Sent: donderdag 10 mei 2012 6:03 > > To: comm...@subversion.apache.org > > Subject: svn commit: r1336475 - in /subversion/branches/1.7.x: ./

Re: Symmetric merge -- current test failures when enabled

2012-05-10 Thread Julian Foad
In r1336529 I fixed the symmetric merge code to work with merging changes into a file from its own history, and in r1336559 I adjusted the tests that depended on a simple merge producing conflicts that the symmetric merge will not produce.  Now there are just these test failures: FAIL:  merge_t

RE: svn commit: r1336475 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_client/client.h subversion/libsvn_client/externals.c subversion/libsvn_client/status.c

2012-05-10 Thread Bert Huijben
> -Original Message- > From: svn-r...@apache.org [mailto:svn-r...@apache.org] > Sent: donderdag 10 mei 2012 6:03 > To: comm...@subversion.apache.org > Subject: svn commit: r1336475 - in /subversion/branches/1.7.x: ./ STATUS > subversion/libsvn_client/client.h subversion/libsvn_client/exte

Re: Symmetric merge -- current test failures when enabled

2012-05-10 Thread Branko Čibej
On 10.05.2012 09:36, Julian Foad wrote: > Branko Čibej wrote: >> On 09.05.2012 18:54, Julian Foad wrote: >>> The second group concerns merging changes into a file from its own (past >>> or >> future) history; this kind of merge isn't a 'sync' so shouldn't >> be handled by this code path. >> >>

Re: Symmetric merge -- current test failures when enabled

2012-05-10 Thread Julian Foad
Branko Čibej wrote: > On 09.05.2012 18:54, Julian Foad wrote: >> The second group concerns merging changes into a file from its own (past or > future) history; this kind of merge isn't a 'sync' so shouldn't > be handled by this code path. > > We keep coming back to this ... I still don't unders