[SciPy-dev] SVN "corruption" / bzr-svn oddity?
Thu Apr 16 02:04:02 CDT 2009
Pauli Virtanen wrote:
> $ git diff --stat 746e23..svn/trunk
> INSTALL.txt | 222 ++++++++++++++-------
> scipy/io/matlab/tests/data/test_skip_variable.mat | Bin 20225 -> 0 bytes
> scipy/io/matlab/tests/test_mio.py | 31 +---
> scipy/special/specfun_wrappers.c | 6 +-
> scipy/special/tests/test_basic.py | 31 +---
> scipy/stats/distributions.py | 2 +-
> So, it seems that bzr-svn does some "deep" SVN-fu on merges. Looking at
> the commit message for r5661 more closely, it says ". (copied from trunk)",
> and indeed "svn log ." indicates that r5661 is based on r5660.
> Does someone understand SVN enough to know what happened and how
> to revert it, if needed?
I am looking at it right now. Since I can make a copy of the svn
repository, I will try your approach locally, and put it online if it works.
More information about the Scipy-dev