[Numpy-discussion] Moving away from svn ?

David Cournapeau cournape@gmail....
Fri Jan 4 14:45:53 CST 2008


On Jan 5, 2008 4:51 AM, Russell E. Owen <rowen@cesmail.net> wrote:
> In article
>
> I am a bit puzzled by the vitriol about merging with svn. svn's built in
> merge is a joke but svnmerge.py works reasonably well (especially newer
> versions of svnmerge.py; I use rev 26317 and the version included in the
> current svn 1.4.6 should be even more recent)

I don't know which version I used. But svnmerge is not that practical:
you have to explicitely say which repository you want to track down,
and merge almost alway fails. Several times, I had conflicts with
files I did not touch, which does not make any sense to me. Merging a
file modified in my branch and in another branch almost always gave me
a conflict. In bzr (and this is really similar in hg at least), when
you merge something, you just say bzr merge SOURCE, and that's it. No
svnsync init, no svnmerge avail / svnmerge merge cycles, etc...

David


More information about the Numpy-discussion mailing list