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

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


Matthieu Brucher wrote:
>
>     > Oups, safe for the "/trunk:1-2871" part. This should be deleted
>     before
>     > a commit to the trunk, I think.
>     Yes, that's what I (quite unclearly) meant: since revision numbers are
>     per- repository in svn, I don't understand the point of tracking trunk
>     revisions: I would think that tracking the last merged version for
>     each
>     branch to be enough (for the kind of merge svn does, at least). If
>     trunk
>     version are tracked, then I would expect two branches using
>     svnmerge to
>     clash each other,
>
>
> In fact, the trunk should be tracked from all the branches, although 
> there will be the problem with merging the different branches (I did 
> not have many troubles with that, but I only tried with a few 
> differences) into the trunk. I don't think only one branch wants to be 
> up to date with the trunk ;).
Sure, that's what I was trying to do (tracking the trunk). But if 
svnmerge needs the information from the trunk, this means each branch 
will need a different value, whereas only one value is possible...

I think I give up, I will use svn merge manually,

cheers,

David


More information about the Numpy-discussion mailing list