Re: [Numpy-discussion] Using svnmerge on numpy: am I missing something ?
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 ___ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion
Re: [Numpy-discussion] Using svnmerge on numpy: am I missing something ?
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... In fact everything is stored in this single property and it is enough : svnmerge extracts the revision not merged according to the branch you want to merge in the trunk (in this case), the other indications for the other branches are not touched. Matthieu -- French PhD student Website : http://matthieu-brucher.developpez.com/ Blogs : http://matt.eifelle.com and http://blog.developpez.com/?blog=92 LinkedIn : http://www.linkedin.com/in/matthieubrucher ___ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion
Re: [Numpy-discussion] Using svnmerge on numpy: am I missing something ?
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 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... IIRC, its presence in the trunk/'s svnmerge-integrated property is a mistake. It belongs in each of the branches independently. For some reason, it got merged into the trunk from one of the branches by mistake, possibly because someone started merge tracking with svnmerge then another used svn merge. It should be removed. -- Robert Kern I have come to believe that the whole world is an enigma, a harmless enigma that is made terrible by our own mad attempt to interpret it as though it had an underlying truth. -- Umberto Eco ___ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion
Re: [Numpy-discussion] Using svnmerge on numpy: am I missing something ?
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 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... IIRC, its presence in the trunk/'s svnmerge-integrated property is a mistake. It belongs in each of the branches independently. For some reason, it got merged into the trunk from one of the branches by mistake, possibly because someone started merge tracking with svnmerge then another used svn merge. It should be removed. I have to confess I may be the one who screwed up when creating one of the sconc branch (I normally take care to never commit to the numpy trunk, but I may have missed it using svnmerge). cheers, David ___ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion
Re: [Numpy-discussion] Using svnmerge on numpy: am I missing something ?
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 try to update my branch with the trunk, I got suprising merge request, in perticular, it tried to merge all trunk revision up to 2871, whereas I created my branch with a copy from the trunk at revision 4676. Am I missing something ? Shouldn't it try to merge from the revision I started the branch (since this revision is a common ancestor) ? AFAIK, the merge command must ALWAYS be given with explicit revision brackets, since this is precisely the information SVN does not track at all. Quoting: http://svnbook.red-bean.com/en/1.0/ch04s04.html But as discussed in the section called Best Practices for Merging, you don't want to merge the changes you've already merged before; you only want to merge everything new on your branch since the last time you merged. The trick is to figure out what's new. The first step is to run svn log on the trunk, and look for a log message about the last time you merged from the branch: $ cd calc/trunk $ svn log … r406 | user | 2004-02-08 11:17:26 -0600 (Sun, 08 Feb 2004) | 1 line Merged my-calc-branch changes r341:405 into the trunk. … Aha! Since all branch-changes that happened between revisions 341 and 405 were previously merged to the trunk as revision 406, you now know that you want to merge only the branch changes after that—by comparing revisions 406 and HEAD. As you can see, they recommend that you indicate in that particular log message the revision brackets of what you've already merged, so you can find that information easily later. Once you have this information on record, you start doing all your future updates on the branch with specific revision ranges, and that seems to work reasonably well. HTH, f ___ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion
Re: [Numpy-discussion] Using svnmerge on numpy: am I missing something ?
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 (http://projects.scipy.org/scipy/numpy/wiki/MakingBranches). When I try to update my branch with the trunk, I got suprising merge request, in perticular, it tried to merge all trunk revision up to 2871, whereas I created my branch with a copy from the trunk at revision 4676. Am I missing something ? Shouldn't it try to merge from the revision I started the branch (since this revision is a common ancestor) ? AFAIK, the merge command must ALWAYS be given with explicit revision brackets, since this is precisely the information SVN does not track at all. Quoting: http://svnbook.red-bean.com/en/1.0/ch04s04.html But as discussed in the section called Best Practices for Merging, you don't want to merge the changes you've already merged before; you only want to merge everything new on your branch since the last time you merged. The trick is to figure out what's new. The first step is to run svn log on the trunk, and look for a log message about the last time you merged from the branch: $ cd calc/trunk $ svn log … r406 | user | 2004-02-08 11:17:26 -0600 (Sun, 08 Feb 2004) | 1 line Merged my-calc-branch changes r341:405 into the trunk. … Aha! Since all branch-changes that happened between revisions 341 and 405 were previously merged to the trunk as revision 406, you now know that you want to merge only the branch changes after that—by comparing revisions 406 and HEAD. As you can see, they recommend that you indicate in that particular log message the revision brackets of what you've already merged, so you can find that information easily later. Once you have this information on record, you start doing all your future updates on the branch with specific revision ranges, and that seems to work reasonably well. 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 surprised by the svnmerge starting revisions, cheers, David ___ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion
Re: [Numpy-discussion] Using svnmerge on numpy: am I missing something ?
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 surprised by the svnmerge starting revisions, OK, I've always just used manual revision tracking, since I basically don't trust svnmerge. Seems I was right, since the manual process at least works, even if it's clunky and requires lots of care. Maybe you should be using a DVCS. Oh wait... ;-) Cheers, f ___ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion
Re: [Numpy-discussion] Using svnmerge on numpy: am I missing something ?
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 error-prone). More specifically, I am surprised by the svnmerge starting revisions, OK, I've always just used manual revision tracking, since I basically don't trust svnmerge. Seems I was right, since the manual process at least works, even if it's clunky and requires lots of care. Between a working clunky solution and a clunky non working solution, the choice is not difficult :) I just wanted to check whether I did something wrong or if svnmerge was fragile (I was a bit surprised, because I could swear I managed to make it work at some point in another branch) Maybe you should be using a DVCS. Oh wait... ;-) Don't worry, I have never used subversion for my own projects, I've never understood the complexity of the thing :) cheers, David ___ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion
Re: [Numpy-discussion] Using svnmerge on numpy: am I missing something ?
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, which I have initialized exactly as documented on the numpy wiki (http://projects.scipy.org/scipy/numpy/wiki/MakingBranches). When I try to update my branch with the trunk, I got suprising merge request, in perticular, it tried to merge all trunk revision up to 2871, whereas I created my branch with a copy from the trunk at revision 4676. Am I missing something ? Shouldn't it try to merge from the revision I started the branch (since this revision is a common ancestor) ? AFAIK, the merge command must ALWAYS be given with explicit revision brackets, since this is precisely the information SVN does not track at all. Quoting: http://svnbook.red-bean.com/en/1.0/ch04s04.html But as discussed in the section called Best Practices for Merging, you don't want to merge the changes you've already merged before; you only want to merge everything new on your branch since the last time you merged. The trick is to figure out what's new. The first step is to run svn log on the trunk, and look for a log message about the last time you merged from the branch: $ cd calc/trunk $ svn log … r406 | user | 2004-02-08 11:17:26 -0600 (Sun, 08 Feb 2004) | 1 line Merged my-calc-branch changes r341:405 into the trunk. … Aha! Since all branch-changes that happened between revisions 341 and 405 were previously merged to the trunk as revision 406, you now know that you want to merge only the branch changes after that—by comparing revisions 406 and HEAD. As you can see, they recommend that you indicate in that particular log message the revision brackets of what you've already merged, so you can find that information easily later. Once you have this information on record, you start doing all your future updates on the branch with specific revision ranges, and that seems to work reasonably well. 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 surprised by the svnmerge starting revisions, cheers, David ___ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion -- French PhD student Website : http://matthieu-brucher.developpez.com/ Blogs : http://matt.eifelle.com and http://blog.developpez.com/?blog=92 LinkedIn : http://www.linkedin.com/in/matthieubrucher ___ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion
Re: [Numpy-discussion] Using svnmerge on numpy: am I missing something ?
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 ___ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion
Re: [Numpy-discussion] Using svnmerge on numpy: am I missing something ?
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 - 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 ? No, this is what I expected. Could you send us the content of svnmerge-integrated for the build_with_scons branch before the merge ? Matthieu -- French PhD student Website : http://matthieu-brucher.developpez.com/ Blogs : http://matt.eifelle.com and http://blog.developpez.com/?blog=92 LinkedIn : http://www.linkedin.com/in/matthieubrucher ___ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion
Re: [Numpy-discussion] Using svnmerge on numpy: am I missing something ?
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 - 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 ? No, this is what I expected. Could you send us the content of svnmerge-integrated for the build_with_scons branch before the merge ? Matthieu Oups, safe for the /trunk:1-2871 part. This should be deleted before a commit to the trunk, I think. -- French PhD student Website : http://matthieu-brucher.developpez.com/ Blogs : http://matt.eifelle.com and http://blog.developpez.com/?blog=92 LinkedIn : http://www.linkedin.com/in/matthieubrucher ___ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion
Re: [Numpy-discussion] Using svnmerge on numpy: am I missing something ?
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 ? 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 ? No, this is what I expected. Could you send us the content of svnmerge-integrated for the build_with_scons branch before the merge ? Matthieu 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, cheers, David ___ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion
Re: [Numpy-discussion] Using svnmerge on numpy: am I missing something ?
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 ;). But each time you create a branch, you must delete the svnmerge_integrated property and set it correctly. Or you can merge by hand the trunk into each branch, but I don't know if it's hard or not. Matthieu -- French PhD student Website : http://matthieu-brucher.developpez.com/ Blogs : http://matt.eifelle.com and http://blog.developpez.com/?blog=92 LinkedIn : http://www.linkedin.com/in/matthieubrucher ___ Numpy-discussion mailing list Numpy-discussion@scipy.org http://projects.scipy.org/mailman/listinfo/numpy-discussion
