Public Git Hosting - svn/apache.git/log

commit | commitdiff | tree

Paul Burba [Tue, 16 Mar 2010 16:34:33 +0000 (16 16:34 +0000)]

On the 1.6.x-r892050 branch, merge r892085 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r892050@923852 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Paul Burba [Tue, 16 Mar 2010 16:26:57 +0000 (16 16:26 +0000)]

On the 1.6.x-r892050 branch, merge r892050 from trunk, resolving a minor
conflict in merge_tests.py.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r892050@923843 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Paul Burba [Tue, 16 Mar 2010 16:23:23 +0000 (16 16:23 +0000)]

Create a backport branch for the r892050 group.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r892050@923839 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

C. Michael Pilato [Tue, 16 Mar 2010 15:22:28 +0000 (16 15:22 +0000)]

Merge from trunk (with conflict resolution of both the textual and
tree varieties) r904301 and r904394:

* r904301, r904394
    Update every occurence of the Subversion repository URL to apache.org,
    except in CHANGES (for sentimental reasons, I guess).
    Justification:
      Tools and doc references should point at the new locations.
    Notes:
      Merge has a number of conflicts.  Although singly they may be easy to
      resolve, I recommend a backport branch because of the volume.
    Votes:
      +1: neels, cmpilato, rhuijben

Also:

* STATUS
  Remove the related status item.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923804 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 16 Mar 2010 14:59:00 +0000 (16 14:59 +0000)]

* STATUS: Make a couple of items relocatable.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923790 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 16 Mar 2010 14:56:56 +0000 (16 14:56 +0000)]

* STATUS: Update formatting for r923674 group.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923789 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 16 Mar 2010 14:48:28 +0000 (16 14:48 +0000)]

Reintegrate the 1.6.x-issue-3242-partial branch:

* ^/subversion/branches/1.6.x-issue-3242-partial
   Merge a portion of the issue 3242 work, specifically the bit that
   makes mergeinfo queries in the client layer happen against the
   current RA session URL instead of forcibly against the repository
   root URL (which might not be readable by the user per authz
   policy).  While this is not a full solution to issue #3242, it
   should get us back to Subversion 1.4-level behavior which has
   pretty consistently been deemed acceptable (enough) by our user
   base.
   Justification:
     Issue #3242 is a hot issue.  Hot topic, hot tempers, etc.
   Votes:
     +1: cmpilato, ivan, rhuijben

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923779 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 16 Mar 2010 14:46:23 +0000 (16 14:46 +0000)]

Reintegrate the 1.6.x-wc-ng-check-override branch:

* ^/subversion/branches/1.6.x-wc-ng-check-override
   Disable checks for WC-NG working copies while running the test suite.
   Justification:
     Allows 'make check' to succeed in working copies of the 1.6.x branch
     managed by an svn client from trunk. This is for developer convenience,
     it does not make a difference for users.
   Votes:
     +1: stsp, cmpilato, rhuijben

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923777 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 16 Mar 2010 14:44:52 +0000 (16 14:44 +0000)]

Merge r917640, r918211 from trunk:

* r917640, r918211
   Correctly handle invocations of 'svnlook plist --revprop' when
   used with '-t TXN_NAME' instead of '-r REV'.
   r918211 adds a regression test.
   Justification:
     Users are assuming that this works (and trying to employ the
     functionality in pre-commit hooks), but it clearly doesn't.
   Votes:
     +1: cmpilato, lgo, rhuijben

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923776 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 16 Mar 2010 14:39:12 +0000 (16 14:39 +0000)]

Reintegrate the r906256 branch:

* r906256, r906305
   Fix issue #3573 'local non-inheritable mergeinfo changes not properly
   merged with updated mergeinfo'
   Notes:
   Justification:
     svn:mergeinfo should be mergeable, but in this issue mergeinfo changes
     brought down by an update were not properly merged with local changes.
   Notes:
     r906256 is a test demonstrating the problem and r906305 is the fix.
   Branch:
     ^/subversion/branches/1.6.x-issue3573
   Votes:
     +1: pburba, cmpilato, rhuijben

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923768 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 16 Mar 2010 14:37:41 +0000 (16 14:37 +0000)]

Merge r905303 from trunk:

* r905303
   Make 'svnadmin hotcopy' copy fsfs.conf for FSFS repositories.
   Justification:
     svnadmin hotcopy is supposed to copy all files.
   Votes:
     +1: stsp, cmpilato, rhuijben

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923764 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 16 Mar 2010 14:35:33 +0000 (16 14:35 +0000)]

* STATUS: Add a note for the r904301 group.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923760 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 16 Mar 2010 14:22:23 +0000 (16 14:22 +0000)]

Merge r901752 from trunk:

* r901752
   Allow 'svn log' on an uncommitted copy/move destination.
   Notes:
     svn_client_log5 API promises that unspecified peg revisions default
     to svn_opt_revision_working for WC paths; prior to r901752 we were
     not keeping this promise.
   Justification:
     APIs should do what they say they do.
   Votes:
     +1: pburba, cmpilato, rhuijben

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923751 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 16 Mar 2010 14:20:37 +0000 (16 14:20 +0000)]

Reintegrate the 1.6.x-r891672 branch:

* r891672
   Fix issue #3552 - File external from URL cannot overwrite the existing
   versioned item
   Justification:
     This defect affects 'subversive' client users in 1.6.x.
   Notes:
     The backport branch exists in order to make the patch compatible with
     1.6.x tests. r876917 introduces 'switched' to wc status which is not
     available in 1.6.x.
   Branch:
     ^/subversion/branches/1.6.x-r891672
   Votes:
     +1: stylesen, cmpilato, rhuijben

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923749 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Bert Huiben [Tue, 16 Mar 2010 11:32:20 +0000 (16 11:32 +0000)]

* STATUS: Cast a few more votes, approving issue #3242 and #3573 fixes

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923697 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Bert Huiben [Tue, 16 Mar 2010 11:15:50 +0000 (16 11:15 +0000)]

* STATUS: Cast some votes, approving a few groups. Move issue 3605 group.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923695 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Bert Huiben [Tue, 16 Mar 2010 10:54:06 +0000 (16 10:54 +0000)]

Nominate the issue #3605 branch for backport

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923685 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 16 Mar 2010 01:43:05 +0000 (16 01:43 +0000)]

Merge r922516 from trunk:

* r922516
   Tell svn+ssh:// users how to get error messages from ssh when there
   is a connection problem.
   Justification:
     Not everyone realises that svn passes the -q option to ssh by default.
   Votes:
     +1: stsp, rhuijben, cmpilato

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923540 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 16 Mar 2010 01:38:07 +0000 (16 01:38 +0000)]

Reintegrate the 1.6.x-r905326 branch:

* r905326
   Issue #3561: Teach ra_serf the same out-of-date fix we taught ra_neon.
   Justification:
     Feature parity with ra_neon is goodness and fixes real-world issue.
   Branch:
     ^/subversion/branches/1.6.x-r905326
   Votes:
     +1: jerenkrantz, kameshj, cmpilato

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923538 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 16 Mar 2010 01:36:24 +0000 (16 01:36 +0000)]

Merge r904594 from trunk:

* r904594
   Update 'svnadmin verify' to recognize malformed/missing revprops files
   Justification:
     It's misleading for 'svnadmin verify' to say a repository is fine
     when in reality it isn't.
   Votes:
     +1: jwhitlock, danielsh, cmpilato

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923537 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 16 Mar 2010 01:34:14 +0000 (16 01:34 +0000)]

* STATUS: Note the fact that the r892050 group does not merge cleanly.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923536 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 16 Mar 2010 01:28:01 +0000 (16 01:28 +0000)]

Merge r880552 from trunk:

* r880552
   Try to enable TCP keep-alives in svnserve.
   Justification:
     ra_svn clients do this, too. It should not do any harm.
     Is likely to fix hanging svnserve processes which still linger
     blocking on reads from sockets after days of inactivity on the
     connection, a problem seen and reported by MPlayer developers in #svn.
   Votes:
     +1: stsp, rhuijben, cmpilato

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923534 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

C. Michael Pilato [Mon, 15 Mar 2010 17:30:29 +0000 (15 17:30 +0000)]

Review and vote on a bunch of items, approving some of them.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@923349 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Sperling [Sun, 14 Mar 2010 11:43:35 +0000 (14 11:43 +0000)]

* STATUS: Remove r922533 (which was reverted in trunk),
and add Bert's +1 for r922516 from IRC.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@922817 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Sperling [Sat, 13 Mar 2010 11:24:04 +0000 (13 11:24 +0000)]

* STATUS: Add r922533 to r922516 nomination.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@922534 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Sperling [Sat, 13 Mar 2010 10:39:06 +0000 (13 10:39 +0000)]

* STATUS: Nominate r922516

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@922517 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lieven Govaerts [Tue, 2 Mar 2010 22:00:46 +0000 (2 22:00 +0000)]

* STATUS: Nominate r918211 with r917640 and add my vote.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@918214 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

C. Michael Pilato [Mon, 1 Mar 2010 18:50:36 +0000 (1 18:50 +0000)]

Propose r917640 for backport.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@917643 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

C. Michael Pilato [Mon, 1 Mar 2010 18:50:09 +0000 (1 18:50 +0000)]

Indentation fixes. (Why is consistency so difficult?)

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@917642 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Kamesh J [Mon, 1 Mar 2010 13:59:03 +0000 (1 13:59 +0000)]

* STATUS: Nominate r917523.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@917532 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Kamesh J [Mon, 1 Mar 2010 13:55:14 +0000 (1 13:55 +0000)]

* STATUS: Nominate r917512 to r916286 group.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@917525 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ivan Zhakov [Sun, 28 Feb 2010 10:27:42 +0000 (28 10:27 +0000)]

* STATUS: Vote for partial fix of issue #3242.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@917159 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Kamesh J [Thu, 25 Feb 2010 15:23:47 +0000 (25 15:23 +0000)]

* STATUS: Nominate r916286.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@916321 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Kamesh J [Thu, 25 Feb 2010 15:18:54 +0000 (25 15:18 +0000)]

* STATUS: Nominate r878590, r878607, r878625, r878626, r878627.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@916319 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

C. Michael Pilato [Thu, 25 Feb 2010 02:26:38 +0000 (25 02:26 +0000)]

Propose for backport a merge of a partial issue 3242 solution.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@916092 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Mon, 22 Feb 2010 22:40:25 +0000 (22 22:40 +0000)]

* STATUS: Formatting fix.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@915102 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Mon, 22 Feb 2010 22:39:34 +0000 (22 22:39 +0000)]

Reintegrate the 1.6.x-r898963 branch:

* r898963, r899826, r899828
   Fix issue #3501 - Repos & wc issues with some NFS clients, notably NetBSD,
   due to buggy interaction between unlink, rewinddir, and NFS caching.
   Branch resolves two trivial conflicts.
   Justification:
     Bug reporter says, "For me, this problem forces us to stay with
     Subversion 1.4."
   Branch:
     ^/subversion/branches/1.6.x-r898963
   Votes:
     +1: peters, rhuijben, stsp

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@915101 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Sperling [Mon, 22 Feb 2010 22:26:50 +0000 (22 22:26 +0000)]

* STATUS: Downgrade my vote for the r878078 from -0 to -1 (related code
still needs to be fixed in trunk). Vote for r898963 group, approving.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@915096 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Bert Huiben [Mon, 22 Feb 2010 14:49:22 +0000 (22 14:49 +0000)]

* STATUS: Remove obsolete comment that is most likely related to issue #3574.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@912592 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Sperling [Mon, 15 Feb 2010 13:20:05 +0000 (15 13:20 +0000)]

* STATUS: Nominate the 1.6.x-wc-ng-check-override branch.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@910217 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Sperling [Mon, 15 Feb 2010 10:40:54 +0000 (15 10:40 +0000)]

* STATUS: Vote for r877016 group.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@910195 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

C. Michael Pilato [Fri, 5 Feb 2010 18:44:42 +0000 (5 18:44 +0000)]

Propose r877016 and r902093 for backport.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@907045 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Paul Burba [Thu, 4 Feb 2010 15:19:39 +0000 (4 15:19 +0000)]

* STATUS: Nominate fix for issue #3573, r906256 and r906305.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@906519 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Kamesh J [Tue, 2 Feb 2010 11:09:44 +0000 (2 11:09 +0000)]

Vote for r905326

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@905580 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Justin Erenkrantz [Mon, 1 Feb 2010 19:00:02 +0000 (1 19:00 +0000)]

* STATUS: Propose backport of issue #3561 fix for ra_serf in next 1.6.x
release...

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@905370 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Sperling [Mon, 1 Feb 2010 15:27:29 +0000 (1 15:27 +0000)]

* STATUS: Nominate r905303

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@905307 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Daniel Shahaf [Fri, 29 Jan 2010 22:05:01 +0000 (29 22:05 +0000)]

Upgrade my vote on r904594 to +1 after talking with jeremyw.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@904644 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jeremy Whitlock [Fri, 29 Jan 2010 21:30:31 +0000 (29 21:30 +0000)]

Added backport votes for r904594 (Fix for issue 3441 so that 'svnadmin verify'
recognizes missing/malformed revprops files.) from jwhitlock and danielsh.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@904630 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Daniel Shahaf [Fri, 29 Jan 2010 07:09:11 +0000 (29 07:09 +0000)]

Add r904394 to the r904301 group as trivial fix.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@904395 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Neels Hofmeyr [Fri, 29 Jan 2010 00:28:56 +0000 (29 00:28 +0000)]

* STATUS: Nominate r904301.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@904320 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Philip Martin [Thu, 28 Jan 2010 17:41:46 +0000 (28 17:41 +0000)]

* COMMITTERS: Merge r880450 from trunk to update my email address.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@904183 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Julian Foad [Fri, 22 Jan 2010 18:29:55 +0000 (22 18:29 +0000)]

* COMMITTERS: Update my email address.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@902204 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Paul Burba [Thu, 21 Jan 2010 16:40:31 +0000 (21 16:40 +0000)]

* STATUS: Nominate r901752.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@901764 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Bert Huiben [Thu, 21 Jan 2010 00:23:09 +0000 (21 00:23 +0000)]

* STATUS: Vote for the r898963 group, removing the -0.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@901459 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Wed, 20 Jan 2010 22:11:35 +0000 (20 22:11 +0000)]

Post-release version bump.

* STATUS,
subversion/include/svn_version.h:
Bump version numbers to 1.6.10.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@901403 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Wed, 20 Jan 2010 20:32:16 +0000 (20 20:32 +0000)]

Bring CHANGES up-to-date with trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@901367 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Wed, 20 Jan 2010 20:04:00 +0000 (20 20:04 +0000)]

Merge r900797 from trunk:

* r900797
   Fix the vague commit failure when committed via the out-of-date mirror
   which is out-of-date by irrelevant revisions elsewhere in the repository.
   Justification:
     We see this ourself after moving to ASF often on european mirror.
   Votes:
     +1: kameshj, rhuijben, cmpilato

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@901358 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

C. Michael Pilato [Wed, 20 Jan 2010 13:52:11 +0000 (20 13:52 +0000)]

Vote for r900797, approving. (Go get 'em, Hyrum.)

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@901205 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Bert Huiben [Wed, 20 Jan 2010 11:08:00 +0000 (20 11:08 +0000)]

* STATUS: Vote for r900797 and add a temporary -0 to the r898963 group

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@901131 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 19 Jan 2010 18:07:01 +0000 (19 18:07 +0000)]

Reintegrate the 1.6.x-1.6.8-serfassertion branch:

* ^/subversion/branches/1.6.x-1.6.8-serfassertion
   Fix the assertion as seen while running the tests over svn_ra_serf by
   canonicalizing the basecoll_url before returning it.  See
   http://svn.haxx.se/dev/archive-2010-01/0295.shtml for discussion.
   Justification:
     Failing assertions are bad.
   Votes:
     +1: rhuijben, pburba, lgo

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@900871 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 19 Jan 2010 18:04:43 +0000 (19 18:04 +0000)]

* subversion/include/svn_version.h:
Bump version number.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@900868 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lieven Govaerts [Tue, 19 Jan 2010 17:46:07 +0000 (19 17:46 +0000)]

* STATUS: Vote for serfassertion fix, approving.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@900864 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Paul Burba [Tue, 19 Jan 2010 17:39:51 +0000 (19 17:39 +0000)]

* STATUS: Vote for ^/subversion/branches/1.6.x-1.6.8-serfassertion.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@900863 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Bert Huiben [Tue, 19 Jan 2010 15:55:38 +0000 (19 15:55 +0000)]

* STATUS: Nominate the 1.6.x-1.6.8-serfassertion branch for 1.6.9

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@900826 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Kamesh J [Tue, 19 Jan 2010 14:54:07 +0000 (19 14:54 +0000)]

* STATUS: Nominate r900797 for 1.6.9.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@900805 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Peter Samuelson [Sat, 16 Jan 2010 02:36:25 +0000 (16 02:36 +0000)]

* STATUS: Nominate r898963 group to fix issue #3501.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@899877 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Bert Huiben [Thu, 14 Jan 2010 14:04:27 +0000 (14 14:04 +0000)]

* STATUS: Nominate r898048 for 1.6.9.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@899204 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 12 Jan 2010 18:42:44 +0000 (12 18:42 +0000)]

* CHANGES:
Bring up-to-date with trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@898464 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Mon, 11 Jan 2010 14:09:54 +0000 (11 14:09 +0000)]

Reintegrate the 1.6.x-r896522 branch:

* r896522, r896547
   Fix segfault with 'svn resolve [mine-full | base | theirs-full]'.
   Justification:
     Easily reproducible segfault.
   Notes:
     r896522 is simply the addition of a new test to cover this 1.6.x-only
     bug.  r896547 is the actual fix, done on the backport branch.  Due to
     the ongoing wc-ng work, the fix could not be made on trunk.  For more
     info see http://svn.haxx.se/dev/archive-2010-01/0088.shtml.
   Branch:
     ^/subversion/branches/1.6.x-r896522
   Votes:
     +1: pburba, stsp, rhuijben
     +1: joeswatosh (as a partial committer, not sure if I can vote in the
       main body of the Subversion code.  It solves the bindings segfault,
       the new tests pass, and the diff looks good to me).

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@897869 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Mon, 11 Jan 2010 14:00:21 +0000 (11 14:00 +0000)]

Merge r888715, r895514 from trunk:

  * r888715, r895514
    Make the dll dependencies right when testing the Ruby bindings on
    windows.  (r888715 lets r895514 merge cleanly).
    Justification:
      Explicit is better than implicit.
    Votes:
      +1: joeswatosh, rhuijben

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@897863 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Bert Huiben [Mon, 11 Jan 2010 10:07:23 +0000 (11 10:07 +0000)]

* STATUS: Cast -0 vote. No veto!

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@897823 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Bert Huiben [Mon, 11 Jan 2010 09:43:40 +0000 (11 09:43 +0000)]

* STATUS: Cast some votes, approving two groups. Nominate a new change.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@897819 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Joe Swatosh [Sat, 9 Jan 2010 16:25:10 +0000 (9 16:25 +0000)]

* STATUS: Nominate r888715 and r895514 (what I meant to say last time)

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@897492 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Joe Swatosh [Sat, 9 Jan 2010 16:24:31 +0000 (9 16:24 +0000)]

* STATUS: Nominate r888715 and r895514

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@897491 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Joe Swatosh [Sat, 9 Jan 2010 15:59:11 +0000 (9 15:59 +0000)]

* STATUS: Vote for r896522.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@897479 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Stefan Sperling [Fri, 8 Jan 2010 15:40:18 +0000 (8 15:40 +0000)]

* STATUS: Vote for r896522.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@897232 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Fri, 8 Jan 2010 15:21:59 +0000 (8 15:21 +0000)]

Bump version numbers for 1.6.8, as we will not be releasing 1.6.7.

* STATUS
* subversion/include/svn_version.h:
Bump version numbers to 1.6.8.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@897229 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Paul Burba [Wed, 6 Jan 2010 17:22:36 +0000 (6 17:22 +0000)]

* STATUS: Nominate r896522 and r896547.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@896550 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Mon, 4 Jan 2010 16:16:23 +0000 (4 16:16 +0000)]

Reintegrate the 1.6.x-r39019 branch:

* r879093
   Fix bug where svn_[rangelist|mergeinfo]_[merge|intersect|remove|diff]
   APIs can modify their *non*-output arguments.
   Justification:
     No reports of this causing any problems that I know of, which is
     probably due to the fact that users of an API like svn_mergeinfo_merge
     typically only care about the output arguments.  The new C tests added
     to mergeinfo-test.c clearly demonstrate the bug.
   Branch:
     Resolves a minor conflict in libsvn_client/merge.c where the code
     changed was refactored on trunk.
     ^/subversion/branches/1.6.x-r39019
     The relevant commit on the branch is r879175.
   Votes:
     +1: pburba, julianfoad, rhuijben

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@895677 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Mon, 4 Jan 2010 16:11:43 +0000 (4 16:11 +0000)]

Merge r895653 from trunk:

* r895653
   Update test expectations in the swig-py tests to take the recent mergeinfo
   canonicalization changes into account.
   Justification:
     Passing tests are Good.
   Votes:
     +1: hwright, rhuijben
     +1: stsp (via irc)

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@895675 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Bert Huiben [Mon, 4 Jan 2010 16:02:10 +0000 (4 16:02 +0000)]

* STATUS: Cast some votes, approving two patches

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@895672 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Mon, 4 Jan 2010 15:43:05 +0000 (4 15:43 +0000)]

* STATUS: Nominate r895653.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@895667 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Mon, 4 Jan 2010 14:39:46 +0000 (4 14:39 +0000)]

Merge r876165 from trunk:

* r876175
   Allow use of APR 1.x when testing Ruby bindings on Windows.
   Justification:
     Makes possible testing of the Ruby bindings built with the recommended
     version of APR.
   Votes:
     +1: joeswatosh
     +0: hwright

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@895643 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Mon, 4 Jan 2010 14:36:46 +0000 (4 14:36 +0000)]

* STATUS: +0 Vote for r876175, and approve.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@895642 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Joe Swatosh [Tue, 29 Dec 2009 19:49:18 +0000 (29 19:49 +0000)]

* STATUS: Nominate and vote for r876175

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@894470 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Wed, 23 Dec 2009 14:25:47 +0000 (23 14:25 +0000)]

* CHANGES:
Bring up-to-date with trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@893520 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Senthil Kumaran S [Fri, 18 Dec 2009 09:17:48 +0000 (18 09:17 +0000)]

* STATUS: Nominate and vote for r891672.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@892190 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Paul Burba [Fri, 18 Dec 2009 01:49:29 +0000 (18 01:49 +0000)]

* STATUS: Nominate r892050 and r892085.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@892095 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Paul Burba [Wed, 16 Dec 2009 20:52:00 +0000 (16 20:52 +0000)]

* CHANGES: Manually remove the mergeinfo
  "/subversion/trunk/CHANGES:836421-837700", which describes non-existent
  history.  ^/trunk/CHANGES wasn't added until r841356.  This mergeinfo
  originally came into being in r879237(r39163).  Still trying to figure out
  what happened there, see http://svn.haxx.se/dev/archive-2009-12/0337.shtml.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@891423 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 15 Dec 2009 21:45:45 +0000 (15 21:45 +0000)]

Manually merge the 1.6.x-r40452 branch back to 1.6.x:

* r880525, r880526
   Fix 'svn resolve --accept=theirs-conflict' for targets which live inside
   a subdirectory of the current working directory.
   Justification:
     'svn resolve --accept=theirs-conflict' cannot be used reliably.
   Notes:
     A backport branch is at ^/subversion/branches/1.6.x-r40452.
     1.6.x has an additional bug which does not occur on trunk, requiring
     additional fixes exclusive to 1.6.x. See the log message of r880532
     (which shows what the bug is), and see r880533 (which fixes the bug).
   Votes:
     +1: stsp, pburba, cmpilato

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@891009 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Tue, 15 Dec 2009 21:16:41 +0000 (15 21:16 +0000)]

Reintegrate the 1.6.x-r889840 branch:

* r889840
   When producing svn_mergeinfo_t from string representations, or vice-versa,
   tolerate relative merge source paths, but convert such paths to absolute
   paths in the resulting string/mergeinfo.
   Justification:
     This prevents any syntactically invalid mergeinfo created by issue #3547
     from breaking just about everything that uses mergeinfo, see http://
     mail-archives.apache.org/mod_mbox/subversion-dev/200912.mbox/browser.
   Branch:
     ^/subversion/branches/1.6.x-r889840
   Votes:
     +1: pburba, cmpilato, philip (I'm ignoring merge conflicts on STATUS)

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@890993 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

C. Michael Pilato [Tue, 15 Dec 2009 18:34:52 +0000 (15 18:34 +0000)]

Vote for r880525 group, approving.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@890933 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Philip Martin [Tue, 15 Dec 2009 17:01:13 +0000 (15 17:01 +0000)]

* STATUS: Vote/approve r889840.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@890885 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Julian Foad [Tue, 15 Dec 2009 16:43:02 +0000 (15 16:43 +0000)]

* STATUS: Upgrade my vote on r879093 to +1. Update its branch name.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@890876 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

C. Michael Pilato [Tue, 15 Dec 2009 15:42:10 +0000 (15 15:42 +0000)]

Vote for the r889840 group. One vote from sanity now...

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@890834 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Mon, 14 Dec 2009 22:42:15 +0000 (14 22:42 +0000)]

Merge r884842 from trunk:

* r884842
   Fix a bug in svnsync causing stale sync-locks on mirror repositories.
   Justification:
     Stale sync locks on mirrors are bad.
   Notes:
     http://mail-archives.apache.org/mod_mbox/subversion-dev/200911.mbox/browser
   Votes:
     +1: stsp, lgo, pburba

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@890520 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Paul Burba [Mon, 14 Dec 2009 22:40:39 +0000 (14 22:40 +0000)]

* STATUS: Cast some votes.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@890517 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Sat, 12 Dec 2009 14:38:38 +0000 (12 14:38 +0000)]

Reintegrate the 1.6.x-issue3519 branch:

* r875632 (from ^/subversion/branches/http-protocol-v2@r875632), r880370
   Fix issue #3519: ra_serf using Label header unsupported by mod_dav_svn.
   Justification:
     This is the cause of the switch-tests.py 19 failures we've been ignoring
     for our 1.6.x releases.
   Notes:
     r875632 (from the http-protocol-v2 branch) is a plumbing change.
     r880370 (from trunk) is the real fix.
   Branch:
     ^/subversion/branches/1.6.x-issue3519
   Votes:
     +1: cmpilato, rhuijben, lgo

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@889935 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lieven Govaerts [Sat, 12 Dec 2009 10:15:24 +0000 (12 10:15 +0000)]

* STATUS: cast some votes, approving r875632 goup.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@889912 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Hyrum Kurt Wright [Sat, 12 Dec 2009 05:07:55 +0000 (12 05:07 +0000)]

Merge r888979, r889081 from trunk:

* r888979, r889081
   Make 'svnadmin load --parent-dir PATH' smart enough to know to prepend a
   leading slash onto PATH when using it as a prefix for fixed-up mergeinfo.
   Justification:
     This bug is the reason why all the mergeinfo in our project
     history at the moment is syntactically invalid.
   Votes:
     +1: cmpilato, stylesen, pburba

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@889892 13f79535-47bb-0310-9956-ffa450edef68

RSS Atom