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
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
David Cournapeau wrote:
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
Robert Kern wrote:
David Cournapeau wrote:
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
On Jan 7, 2008 10:41 PM, David Cournapeau [EMAIL PROTECTED] wrote:
Hi,
for my work related on scons, I have a branch build_with_scons in
the numpy trunk, which I have initialized exactly as documented on the
numpy wiki (http://projects.scipy.org/scipy/numpy/wiki/MakingBranches).
When I
Fernando Perez wrote:
On Jan 7, 2008 10:41 PM, David Cournapeau [EMAIL PROTECTED] wrote:
Hi,
for my work related on scons, I have a branch build_with_scons in
the numpy trunk, which I have initialized exactly as documented on the
numpy wiki
On Jan 7, 2008 10:54 PM, David Cournapeau [EMAIL PROTECTED] wrote:
I understand this if doing the merge at hand with svn merge (that's what
I did previously), but I am using svnmerge, which is supposed to avoid
all this (I find the whole process extremely error-prone). More
specifically, I am
Fernando Perez wrote:
On Jan 7, 2008 10:54 PM, David Cournapeau [EMAIL PROTECTED] wrote:
I understand this if doing the merge at hand with svn merge (that's what
I did previously), but I am using svnmerge, which is supposed to avoid
all this (I find the whole process extremely
Hi David,
How did you initialize svnmerge ?
Matthieu
2008/1/8, David Cournapeau [EMAIL PROTECTED]:
Fernando Perez wrote:
On Jan 7, 2008 10:41 PM, David Cournapeau [EMAIL PROTECTED]
wrote:
Hi,
for my work related on scons, I have a branch build_with_scons in
the numpy trunk,
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
2008/1/8, David Cournapeau [EMAIL PROTECTED]:
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
2008/1/8, Matthieu Brucher [EMAIL PROTECTED]:
2008/1/8, David Cournapeau [EMAIL PROTECTED]:
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
-
Matthieu Brucher wrote:
2008/1/8, Matthieu Brucher [EMAIL PROTECTED]
mailto:[EMAIL PROTECTED]:
2008/1/8, David Cournapeau [EMAIL PROTECTED]
mailto:[EMAIL PROTECTED]:
Matthieu Brucher wrote:
Hi David,
How did you initialize svnmerge ?
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
14 matches
Mail list logo
