subversion

Checkout Tools
  • last updated 6 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 877660 is being indexed.

Fixes some python testsuite failures on Windows.

("Can't remove <path>\rep-cache.db")

* subversion/bindings/swig/python/tests/mergeinfo.py,

subversion/bindings/swig/python/tests/wc.py

(tearDown): Close references to the test repository so that

it can be deleted nicely.

* subversion/bindings/swig/python/tests/ra.py,

subversion/bindings/swig/python/tests/repository.py

(tearDown): Override tearDown to close references to the test

repository so that it can be deleted nicely.

Patch by: Jens Peters <jpeters7677{_AT_}gmx.de>

me

Do a function rename, and use a more concise API.

* subversion/libsvn_wc/upgrade.c

(convert_wcprops_walker): Rename to this...

(convert_props_walker): ...from this. Also, consolidate an API call to

use some new spiffy stream APIs.

(convert_wcprops): Update consumer of above.

* STATUS: Note a desire for a backport branch for r36178.

Merge r36527 from trunk:

* r36527

Yet another merge performance improvement: Potentially reduce server

queries about subtree mergeinfo during reverse merges.

Justification:

Large numbers of subtrees with mergeinfo can significantly slow merge

performance, this alleviates that somewhat in a common use case.

Votes:

+1: pburba, rhuijben, cmpilato

Merge r36509 from trunk:

* r36509

Don't contact the server asking about implicit mergeinfo when the

explicit mergeinfo tells us all we need to know about what to merge

and what not to.

Justification:

Avoids needless communication with the server in some use cases. For

users with lots of subtree mergeinfo and slow network connections

the performance improvement should be quite significant.

Votes:

+1: pburba, rhuijben, cmpilato

Merge r37245 from trunk (ignoring conflict on svn_1.6_releasenotes.zh.html)

* r37245

Recommend SQLite 3.6.13.

Justification:

http://svn.haxx.se/dev/archive-2009-04/0411.shtml

Notes:

Accept theirs-conflict while merging.

Votes:

+1: arfrever, rhuijben

+1: cmpilato (ignore conflict with www/svn_1.6_releasenotes.zh.html)

+0: pburba (I'm fine with the premise of the change, but merging this

change produces a tree conflict on www/svn_1.6_releasenotes.zh.html

that need to be addressed first).

Cast some votes.
* STATUS: Yet another vote, but probably not for 1.6.2 :(
Merge r37494, r37499 from trunk:

* r37494, r37499

Fix issue #3407 'Shallow merges incorrectly set mergeinfo on children'.

Justification:

Without this change shallow merges targeting a path with non-inheritable

mergeinfo can record mergeinfo on subtrees which should be excluded by

the requested depth -- see http://subversion.open.collab.net/ds/

viewMessage.do?dsForumId=4&dsMessageId=313877.

Notes:

While merging r37494 accept theirs-conflict.

Votes:

+1: pburba, arfrever, rhuijben

* STATUS: Another vote, approving the r37494 group
Follow-up to r37562:

* build/generator/gen_win.py

(WinGeneratorBase._find_swig): Don't use syntax which is supported only by

Python >=2.5.

A little refactoring followup to r37574.

* subversion/libsvn_wc/update_editor.c

(complete_directory): Calculate the local_abspath once, instead of

several times as needed.

Make entry_remove() accept a db/local_abspath pair, in place of an entries

hash, adm_access baton, and entry name. While entry_remove() just grabs the

dropped parameters internally, instead of using arguments, this change

consistifies the APIs a bit and sets the stage for removing a call to

read_entries()/write_entries().

* subversion/libsvn_wc/crop.c

(crop_children): Update caller.

* subversion/libsvn_wc/adm_ops.c

(tweak_entries, svn_wc_delete3, revert_entry,

svn_wc_remove_from_revision_control): Update callers.

* subversion/libsvn_wc/update_editor.c

(complete_directory, do_entry_deleteion): Same.

* subversion/libsvn_wc/entries.c

(svn_wc__entry_remove): Fetch the adm_access baton and use it for removing

the entry.

* subversion/libsvn_wc/entries.h

(svn_wc__entry_remove): Update params and docstring.

* subversion/libsvn_wc/log.c

(log_do_delete_entry): Update caller.

Add the '--disable-local-use' option which allows to disable using of locally

built executables.

* configure.ac

(local-use): New.

* Makefile.in

(local-all): Depend on '@TRANSFORM_LIBTOOL_SCRIPTS@'.

* build/transform_libtool_scripts.sh: Delete the check for Mac OS which was

moved to configure.ac.

* tools/dev/analyze-svnlogs.py

(print_report): Update calls to print() for compatibility with Python 3.

Merge r36613, r36615, r36631, r36641 from trunk:

* r36613, r36615, r36631, r36641

Avoid potential segfault when dealing with subtree mergeinfo.

Justification:

One user reported a segfault due to the way, prior to this change, that

we set children_with_mergeinfo elements to NULL rather than removing

the elements from the array, see

http://svn.haxx.se/dev/archive-2009-03/0382.shtml.

Notes:

While segfaults are serious, this one is not sufficient by itself to

hold up 1.6.0 given that it is not a regression from 1.5.x, no one has

been able to produce a reproduction recipe, and only one user has

reported it (and they were able to work around it). The fix itself is

r36613, r36631, and r36641. r36615 is a variable renaming change that

is necessary to avoid a conflict.

Votes:

+1: pburba, rhuijben, arfrever

On the '1.6.x' branch:

* STATUS: Vote for some revisions.

* CHANGES: Fix typos.

STATUS: Vote +0 and add some notes/justification for r37245.
* CHANGES:

(1.6.2): New section, populated with current set of merges from trunk.

Merge r37519 from trunk:

* r37519

Stop merge of difference between two different repositories from

occasionally "working".

Justification:

Previously, given URL_X and URL_Y which point to two completely

different repositories, the merge 'svn merge URL_X@M URL_Y@N TARGET_WC'

might actually succeed and merge URL_X@M:URL_X@N to TARGET_WC.

Votes:

+1: pburba, arfrever, rhuijben

Merge r37121 from trunk:

* r37121

Fix test_dirent_get_absolute for the case where the current directory

on C: is C:/.

Justification:

The dirent code should not rely on svn_path rules, especially when the

dirent functions were added to resolve these issues.

Votes:

+1: rhuijben, lgo, pburba

* STATUS: Vote and approve r37121.
On the 'python-3-compatibility':

Merge r37468:37562 from trunk.

  1. … 57 more files in changeset.
Follow-up to r37522:

* build/generator/gen_win.py

(WinGeneratorBase._find_swig): Don't try to use 'outfp' when it isn't defined.

Found by: rhuijben

* STATUS: More votes, approving r37519
On the '1.6.x' branch:

* STATUS: Nominate r37478, r37543, r37544, r37545 and r37547.

Merge r37527 from trunk:

* r37527

Resolve naming collision on static stat() function in svnserve.

Justification:

Under some specific circumstances stat() could be defined twice in

svnserve, which gives a compiletime error. This patch removes the

dependency on a local patch for those users that found this issue.

Votes:

+1: rhuijben, hwright, arfrever

    • ?
    /branches/1.6.x/subversion/svnserve/serve.c
Merge r37333 from trunk:

* r37333

Don't worry about the merge tracking complexities of non-inheritable

mergeinfo and missing subtrees if we are *not* honoring mergeinfo.

Justification:

Without this change some edge cases where mergeinfo is not being

honored (e.g. --ignore-ancestry, foreign repos merges) can record

mergeinfo.

Votes:

+1: pburba, arfrever, rhuijben

Merge r37398 from trunk:

* r37398

Fix a memory leak when performing mergeinfo aware merges.

Justification:

Not always destroying a subpool when processing subtrees with mergeinfo.

Votes:

+1: pburba, arfrever, rhuijben