Re: Integration of the consistency_tests branch (and becoming a relax committer). -- December 17, 2007 - 21:19

Hi Ed,

The consistency tests code is now fully integrated into the 1.2 line...

Thanks for the help concerning SVN !

For the consistency tests code in the 1.3 line, I would like to start the work as soon as possible.
Do I have commit access to this branch ?
Would it be a good idea to merge the changes that happened in the 1.3 line to the branch before starting the work (However, svnmerge does not seem to have been initialized in this branch right now.) ?

Cheers


Séb  :)



Edward d'Auvergne wrote:

On Dec 17, 2007 7:52 PM, Sebastien Morin <sebastien.morin.1@xxxxxxxxx> wrote:
  

 Hi Ed,

 You were right, I needed a checked out copy with commit access. So, the
merging of the changes from the 1.2 main line to my branch is now done.
    

I saw that you made the commit a few minutes ago and that everything
was ok.  You will need to delete and re-checkout all your SVN copies.


  

 However, I'm stuck at committing this version (my branch merged with the
1.2 main line, on my laptop) back to the repository 1.2 main line.

 The command I use (from this new version directory) is :


 svn ci -F ../LOG_FILE svn+ssh://semor@xxxxxxxxxxx/svn/relax/1.2
    

You will need to merge the branch back into 1.2 first.  You first
merged all of the 1.2 changes into the branch so that it was in sync.
Now you must merge back.


  

 However, I get the following error message :

 svn: 'svn+ssh://semor@xxxxxxxxxxx/svn/relax' is not a working copy
 svn: Can't open file 'svn+ssh://semor@xxxxxxxxxxx/svn/relax/.svn/entries':
No such file or directory

 Should I proceed differently ? Should I use the 'svn merge' command by
typing (from my checked out copy of the 1.2 main line) something like :

 svn merge -r3320:4199
svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/consistency_tests_1.2
    

This is correct if r3320 is the first revision of the branch and 4198
is the last.  Note that the last number must be one greater than the
current revision, so you need 4200.



  

 and then :


 svn ci -F ../LOG_FILE
    

That is correct.

Cheers,

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