[Numpy-discussion] Using svnmerge on numpy: am I missing something ?

David Cournapeau david@ar.media.kyoto-u.ac...
Tue Jan 8 00:40:01 CST 2008


Matthieu Brucher wrote:
> Hi David,
>
> How did you initialize svnmerge ?
As said in the numpy wiki. More precisely:
    - In a svn checkout of the trunk, do svn up to be up to date
    - svn copy TRUNK MY_BRANCH
    - use svnmerge init MY_BRANCH
    - svn ci -F svnmerge-commit.txt
    - svn switch MY_BRANCH
    - svnmerge init TRUNK
    - svn ci -F svnmerge-commit.txt

One thing which is strange is that in the numpy trunk, you can see the 
following as svnmerge-integrated:

Property svnmerge-integrated set to /branches/build_with_scons:1-4676 
/branches/cleanconfig_rtm:1-4610 /branches/distutils-revamp:1-2752 
/branches/distutils_scons_command:1-4619 /branches/multicore:1-3687 
/branches/numpy.scons:1-4484 /trunk:1-2871

Does that mean that you cannot use svnmerge with several branches at the 
same time ?

cheers,

David


More information about the Numpy-discussion mailing list