Re: r4200 - in /1.2: generic_fns/ maths_fns/ prompt/ sample_scripts/ specific_fns/ test_suite/Re: r4200 - in /1.2: generic_fns/ maths_fns/ prompt/ sample_scripts/ specific_fns/ test_suite/|
Hi Ed, I always work with fresh clean versions of the relax SVN code. For the keys, when I made test with a different machine, I just used the same key that was copied, but I should register different ones... However, the thing is that it didn't worked at home with my laptop but worked in the lab with my laptop... There are thus two possibilities : 1. different IP address or network details ; 2. reboot (maybe something was wrong on my laptop and a reboot made things clean, I'll try to reboot and see if it's better when a similar problem arises). Cheers Séb Edward d'Auvergne wrote: That is a strange problem. Maybe it would be best to get clean, fresh versions of all the relax SVN code. You have registered SSH public keys with Gna! for all the machines you are using? Regards, Edward On Dec 18, 2007 3:45 PM, Sebastien Morin <sebastien.morin.1@xxxxxxxxx> wrote:Hi, I tried this a few times on different computers from home... without success. However, now in the university, everything works... THIS IS STRANGE ! ... Anyway, the merge is now done and, hopefully, fine... Thanks for the tips !!! Séb Edward d'Auvergne wrote: Hi, I would try to delete the 1.2 checked out copy you have and check it out again. Maybe there is a corruption somewhere in that copy? Regards, Edward On Dec 18, 2007 2:40 PM, Sebastien Morin <sebastien.morin.1@xxxxxxxxx> wrote: Hi Ed, As you proposed, I checked out a new fresh copy of the main 1.2 line and then typed : $ svn merge -r3320:4200 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/ U prompt/__init__.py U prompt/value.py U prompt/molmol.py U prompt/interpreter.py U prompt/run.py U prompt/grace.py svn: Copyfrom-url 'svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/prompt/consistency_tests.py' has different repository root than 'svn+ssh://svn.gna.org/svn/relax' Again this strange error message concerning the repository roots... Should I first revert revisions 4204 and 4202 (the undeleting of the branch) ? Don't you get this message when trying the same command from a fresh copy (r4204) of the main 1.2 line ? Cheers Séb Edward d'Auvergne wrote: On Dec 18, 2007 5:04 AM, Sebastien Morin <sebastien.morin.1@xxxxxxxxx> wrote: Hi again, Is this possible that the problem arises because of the way I undeleted the branch..? This will be the case. Because you copied the old revision rather than reverting, this caused the history of the branch to be reset. If you run 'svn log -v --stop-on-copy' on the branch now, you will see only two revisions. I used 'svn copy' from revision 4200 instead of undoing r4201... This gives the same copy, however, when comes to merging back to the main line, maybe the changes are not seen the same way as the 'new' branch was created at revision 4202 instead of 3320 as was originally the case for the branch... Would it have been better if I had used something like : svn merge -r4201:4200 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2 This would have been the best option. or svn merge -c -4201 svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2 or svn merge -r4201:4200 svn+ssh://semor@xxxxxxxxxxx/svn/relax or svn merge -c -4201 svn+ssh://semor@xxxxxxxxxxx/svn/relax There seems to be many ways to do the same thing using subversion, however with some ways better than others... It is very flexible. This is good in some ways but makes it much more complex. Anyway I have tried to do the merging you are attempting, without committing, and have found what is causing the conflicts. The branch need not be restored to do the merging as everything is up to date prior to the deletion and is still all in the repository. I won't commit anything so that you can do it and that we don't make the same changes. So the first command I used was: $ svn merge -r3320:4200 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2/ U prompt/__init__.py U prompt/value.py U prompt/molmol.py U prompt/interpreter.py U prompt/run.py U prompt/grace.py A prompt/consistency_tests.py A maths_fns/consistency_tests.py U generic_fns/runs.py A sample_scripts/consistency_tests.py U test_suite/test_suite.py U test_suite/__init__.py A test_suite/consistency_tests.py U specific_fns/__init__.py A specific_fns/consistency_tests.py U specific_fns/main.py U specific_fns/specific_setup.py C . This was in an up to date copy of the 1.2 line. I then typed: $ scons clean to remove all pyc files. Then: $ svn st ? dir_conflicts.prej ? .sconsign C . M prompt/__init__.py M prompt/value.py M prompt/molmol.py M prompt/interpreter.py M prompt/run.py M prompt/grace.py A + prompt/consistency_tests.py A + maths_fns/consistency_tests.py M generic_fns/runs.py A + sample_scripts/consistency_tests.py M test_suite/test_suite.py M test_suite/__init__.py A + test_suite/consistency_tests.py M specific_fns/__init__.py A + specific_fns/consistency_tests.py M specific_fns/main.py M specific_fns/specific_setup.py Note the file 'dir_conflicts.prej'. This describes the conflict, which is simply the svnmerge properties on the root directory. E.g: $ cat dir_conflicts.prej Trying to change property 'svnmerge-blocked' from '/1.3:2506,2579,2582,2594,2596,2598,2601-2604,2606-2610,2613-2615,2617,2633,2645,2649-2655,2657,2659,2661,2663,2668-2670,2673,2675-2676,2707,2717,2719,2724,2732-2733,2737,2739,2743,2769,2775,2779,2781,2785,2790-2792,2798-2799,2829,2831-2833,2838,2844,2847-2853,2856-2857,2859,2864-2872,2874,2878-2879,2881-2882,2884,2886,2888,2891,2893-2897,2910-2912,2914-2928,2931,2933-2936,2939,2949,2993-3011,3013-3022,3025,3033-3034,3058,3074-3075,3077,3080-3081,3086,3088-3096,3098,3100-3116,3121-3171,3173-3194,3196-3197,3200-3207,3209,3211-3234,3240,3245,3247,3255-3258,3260,3286,3290,3297,3303-3308' to '/1.2:3334', but property already exists with value '/1.3:2506,2579,2582,2594,2596,2598,2601-2604,2606-2610,2613-2615,2617,2633,2645,2649-2655,2657,2659,2661,2663,2668-2670,2673,2675-2676,2707,2717,2719,2724,2732-2733,2737,2739,2743,2769,2775,2779,2781,2785,2790-2792,2798-2799,2829,2831-2833,2838,2844,2847-2853,2856-2857,2859,2864-2872,2874,2878-2879,2881-2882,2884,2886,2888,2891,2893-2897,2910-2912,2914-2928,2931,2933-2936,2939,2949,2993-3011,3013-3022,3025,3033-3034,3058,3074-3075,3077,3080-3081,3086,3088-3096,3098,3100-3116,3121-3171,3173-3194,3196-3197,3200-3207,3209,3211-3234,3240,3245,3247,3255-3258,3260,3286,3290,3297,3303-3308,3333,3339-3340,3342,3346,3352,3355,3359,3369,3379,3382-3524,3528-3529,3540-3691,3695,3697-3713,3715-3719,3721-3728,3730-3731,3733-3755,3757,3773-3807,3809-3833,3836-3838,3840-3869,3872-3905,3907-3974,3976-3986,4004,4014-4015,4018-4021,4027-4031,4061-4102,4104-4114,4137-4139'.Trying to change property 'svnmerge-integrated' from '/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984,2988,3076,3083-3084,3087,3117,3299,3309,3312,3314,3318' to '/1.2:1-3319,3332,3343-4143', but property already exists with value '/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984,2988,3076,3083-3084,3087,3117,3299,3309,3312,3314,3318,3345,3372'. As these changes were not merged, the properties of the 1.2 line are still ok. For example if you type: $ svnmerge avail 4141,4144-4175 This is the same as prior to the merge. So to resolve the conflicting state, type: $ svn resolved . Then you can commit the changes and all will be good. This merging process is a little more complex than the normal merging, because both the branch and the 1.2 line have svnmerge properties. You shouldn't have these types of problems with the 1.3 line though. Regards, Edward -- Sebastien Morin Etudiant au PhD en biochimie Laboratoire de resonance magnetique nucleaire Dr Stephane Gagne CREFSIP (Universite Laval, Quebec, CANADA) 1-418-656-2131 #4530 -- Sebastien Morin Etudiant au PhD en biochimie Laboratoire de resonance magnetique nucleaire Dr Stephane Gagne CREFSIP (Universite Laval, Quebec, CANADA) 1-418-656-2131 #4530 -- Sebastien Morin Etudiant au PhD en biochimie Laboratoire de resonance magnetique nucleaire Dr Stephane Gagne CREFSIP (Universite Laval, Quebec, CANADA) 1-418-656-2131 #4530 |