This commit is problematic. r4618 should have been ported to your
branch. The other were ok to block, but could have been merged
anyway. To overcome the problem, type:
$ svn merge -r4616:4617 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2
And then use a commit message such as:
Ported r4617 from the 1.2 line.
The command used was:
svn merge -r4616:4617 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2
.....
r4617 | bugman | 2008-01-10 21:37:22 +0100 (Thu, 10 Jan 2008) | 6 lines
Changed paths:
M /1.2/sample_scripts/full_analysis.py
Modified the full_analysis.py script to be usable when no structure
is available.
This is in response to Sebastien's post at
https://mail.gna.org/public/relax-users/2008-01/msg00006.html.
.....
By blocking this, your branch will not be able to be properly merged
back into the 1.3 line. The 'svn merge' command will fix this. The
general rule though is that for your branch, all changes should be
merged. Everything that happens in 1.3 must also occur in all its
branches for them to be in sync.
Regards,
Edward
On Jan 11, 2008 5:22 PM, <sebastien.morin.1@xxxxxxxxx> wrote:
Author: semor
Date: Fri Jan 11 17:22:20 2008
New Revision: 4647
URL: http://svn.gna.org/viewcvs/relax?rev=4647&view=rev
Log:
Blocked revisions 4618,4621-4623 via svnmerge
................
r4618 | bugman | 2008-01-10 15:40:40 -0500 (Thu, 10 Jan 2008) | 17 lines
Ported r4617 from the 1.2 line.
The command used was:
svn merge -r4616:4617 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2
.....
r4617 | bugman | 2008-01-10 21:37:22 +0100 (Thu, 10 Jan 2008) | 6 lines
Changed paths:
M /1.2/sample_scripts/full_analysis.py
Modified the full_analysis.py script to be usable when no structure is
available.
This is in response to Sebastien's post at
https://mail.gna.org/public/relax-users/2008-01/msg00006.html.
.....
................
r4621 | semor | 2008-01-10 22:41:34 -0500 (Thu, 10 Jan 2008) | 3 lines
Initialized merge tracking via "svnmerge" with revisions "1-2505" from
svn+ssh://semor@xxxxxxxxxxx/svn/relax/1.2
................
r4622 | semor | 2008-01-10 22:43:05 -0500 (Thu, 10 Jan 2008) | 20 lines
Merged revisions 4619-4620 via svnmerge from
svn+ssh://semor@xxxxxxxxxxx/svn/relax/1.2
........
r4619 | semor | 2008-01-10 16:38:09 -0500 (Thu, 10 Jan 2008) | 7 lines
Modified the full_analysis.py script so it can handle cases when no
residues need to be excluded.
This change was proposed in a post at:
https://mail.gna.org/public/relax-users/2008-01/msg00008.html
(Message-id:
<47868730.1030205@xxxxxxxxx>)
........
r4620 | semor | 2008-01-10 16:43:29 -0500 (Thu, 10 Jan 2008) | 6 lines
Corrected a mistake.
The inverse of what was wanted was produced concerning the possibility
of not giving a file for
unresolved residues.
........
................
r4623 | bugman | 2008-01-11 03:24:03 -0500 (Fri, 11 Jan 2008) | 9 lines
Reverted r4621, the setting up of svnmerge properties from 1.2 to 1.3.
The following command did not work:
svn merge -r4621:4620 .
So instead the following command was used:
svn propdel svnmerge-integrated
................
Modified:
branches/consistency_tests_1.3/ (props changed)
Propchange: branches/consistency_tests_1.3/
------------------------------------------------------------------------------
svnmerge-blocked = /1.3:4618,4621-4623
_______________________________________________
relax (http://nmr-relax.com)
This is the relax-commits mailing list
relax-commits@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
Re: r4647 - /branches/consistency_tests_1.3/