Hi Han, I've had a careful look at this, and I think this change is totally harmless and actually does nothing. The available revisions for merging with this change are:
[edward@localhost xyz_merge]$ svnmerge.py avail 12937-12941,12943-12945,12947-12952,12954-12957,12959-12960,12965-12967,12969-12975,12982-13022,13028-13029,13045-13046,13153,13258,13357-13359,13411,13510-13512,13577,13631-13632,13641,13655,13660,13683,13686,13706,13742-13743,13748-13749,13780,13835-13836,13845-13857,13904-13906,13909,13919,13926-13927,13929,13932 [edward@localhost xyz_merge]$ The previously merged revisions are: ------------------------------------------------------------------------ r12936 | bugman | 2011-06-09 17:23:43 +0200 (Thu, 09 Jun 2011) | 433 lines Changed paths: M /branches/xyz M /branches/xyz/dep_check.py M /branches/xyz/docs/latex/fetch_docstrings.py M /branches/xyz/docs/latex/install.tex A /branches/xyz/extern (from /1.3/extern:12935) M /branches/xyz/generic_fns/structure/scientific.py M /branches/xyz/graphics/wizards/value/value.png M /branches/xyz/graphics/wizards/value/value.svg M /branches/xyz/gui/analyses/auto_model_free.py M /branches/xyz/gui/analyses/auto_noe.py M /branches/xyz/gui/analyses/auto_rx_base.py A /branches/xyz/gui/analyses/base.py (from /1.3/gui/analyses/base.py:12935) M /branches/xyz/gui/analyses/results.py M /branches/xyz/gui/components/spectrum.py M /branches/xyz/gui/menu.py M /branches/xyz/gui/relax_gui.py M /branches/xyz/gui/settings.py M /branches/xyz/gui/user_functions/residue.py M /branches/xyz/gui/user_functions/spin.py M /branches/xyz/info.py M /branches/xyz/sample_scripts/model_free/dasha.py M /branches/xyz/sample_scripts/model_free/diff_min.py A /branches/xyz/test_suite/shared_data/structures/Indol_test.xyz (from /1.3/test_suite/shared_data/structures/Indol_test.xyz:12935) M /branches/xyz/test_suite/system_tests/structure.py M /branches/xyz/test_suite/system_tests/unit_vectors.py M /branches/xyz/test_suite/unit_tests/_generic_fns/_structure/test_api_base.py M /branches/xyz/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py M /branches/xyz/version.py Merged revisions 12840-12851,12854-12888,12891-12897,12899-12935 via svnmerge from svn+ssh://[email protected]/svn/relax/1.3 ........ So as you can see, the revisions do not overlap. Regards, Edward On 28 July 2011 10:35, Edward d'Auvergne <[email protected]> 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
