Hi Edward,
that is strange! I have tried ./relax -u and there was no error. And
I also checked with syn diff, the code should be the same with yours.
Best,
Han
On Aug 1, 2011, at 2:26 PM, Edward d'Auvergne wrote:
Hi Han,
I just ran the full test suite, and there are still 2 errors. These
are in the unit tests, which you can check with:
$ ./relax -u
I'm sure you'll be able to work out what is wrong and how to fix it.
Regards,
Edward
On 1 August 2011 14:15, Edward d'Auvergne <[email protected]>
wrote:
Hi,
If you think it's ready, I can merge it back into the main line.
Just
make sure you have all of the svnmerge updates applied and committed.
I will run the test-suite with:
$ ./relax -x
and see if everything is now happy. This new user function should
one
day be added to the GUI as well. Hopefully the GUI in the
gui_testing
branch will now be flexible enough to be able to perform all of the
small molecule work from the GUI. This will require implementing
many
user functions as GUI elements in the future though.
Cheers,
Edward
On 1 August 2011 14:10, Han Sun <[email protected]> wrote:
Hi Edward,
I checked that all tests pass now for reading xyz files and
loading spins or
vectors. Do you think it is now the time to merge this branch to
the main
line?
Best wishes,
Han
On Jul 28, 2011, at 10:47 AM, Edward d'Auvergne wrote:
Hi,
See my last post, it should not be a problem. Have a look at
r12832
though, this is where I ran:
$ svnmerge.py init
and committed the change. So merge tracking was already
initialised
on the xyz branch. I don't think r13944 will cause a problem
though.
Regards,
Edward
On 28 July 2011 10:45, Han Sun <[email protected]> wrote:
Hi,
I did exact the same as it is written in manual:
1. $ svnmerge.py init
2. svn ci -F svnmerge-commit-message.txt
3. After I typed "svnmerge.py merge" it showed one conflict.
Is there something wrong?
Best
Han
On Jul 28, 2011, at 10:35 AM, Edward d'Auvergne wrote:
Ouch, how was that possible? Merge tracking is already
initialised on
the xyz branch. This commit might cause some serious headaches :S
And reverting it might also be problematic :S
Regards,
Edward
On 28 July 2011 10:15, <[email protected]> wrote:
Author: han87
Date: Thu Jul 28 10:15:38 2011
New Revision: 13944
URL: http://svn.gna.org/viewcvs/relax?rev=13944&view=rev
Log:
Initialized merge tracking via "svnmerge" with revisions
"1-12830" from
svn+ssh://[email protected]/svn/relax/1.3
Modified:
branches/xyz/ (props changed)
Propchange: branches/xyz/
------------------------------------------------------------------
------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 28 10:15:38 2011
@@ -1,1 +1,1 @@
-/1.3:1-12935
+/1.3:1-12830 /1.3:1-12935
_______________________________________________
relax (http://nmr-relax.com)
This is the relax-commits mailing list
[email protected]
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
_______________________________________________
relax (http://nmr-relax.com)
This is the relax-devel mailing list
[email protected]
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-devel
_______________________________________________
relax (http://nmr-relax.com)
This is the relax-devel mailing list
[email protected]
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-devel
