[prev in list] [next in list] [prev in thread] [next in thread]
List: relax-devel
Subject: Re: r5274 - in /1.3: ./ docs/latex/ generic_fns/ maths_fns/ prompt/ sample_scripts/ specific_fns/ te
From: Sébastien_Morin <sebastien.morin.1 () domain ! hid>
Date: 2008-04-03 20:15:17
Message-ID: 47F53AD5.2010809 () domain ! hid
[Download RAW message or body]
Hi Edward,
Fine. Incorporating this new protocol in the manual will surely help
everyone in the future.
Cheers
Sébastien
Edward d'Auvergne wrote:
> Hi,
>
> This merger appeared to be relatively successful. I have noticed one
> problem caused by svnmerge, see below.
>
>
> On Thu, Apr 3, 2008 at 8:11 PM, <sebastien.morin.1@domain.hid> wrote:
>
> > Author: semor
> > Date: Thu Apr 3 20:11:24 2008
> > New Revision: 5274
> >
> > URL: http://svn.gna.org/viewcvs/relax?rev=5274&view=rev
> > Log:
> > Merged the consistency tests branch back into the 1.3 line.
> >
> > The command used was:
> > svn merge -r3321:HEAD svn+ssh://semor@domain.hid/consistency_tests_1.3/ .
> >
> > The code is almost ready and further changes will not affect the rest of the \
> > code.
> >
> > Added:
> > 1.3/docs/latex/consistency_tests.tex
> > - copied unchanged from r5273, \
> > branches/consistency_tests_1.3/docs/latex/consistency_tests.tex \
> > 1.3/maths_fns/consistency_tests.py
> > - copied unchanged from r5273, \
> > branches/consistency_tests_1.3/maths_fns/consistency_tests.py \
> > 1.3/prompt/consistency_tests.py
> > - copied unchanged from r5273, \
> > branches/consistency_tests_1.3/prompt/consistency_tests.py \
> > 1.3/sample_scripts/consistency_tests.py
> > - copied unchanged from r5273, \
> > branches/consistency_tests_1.3/sample_scripts/consistency_tests.py \
> > 1.3/specific_fns/consistency_tests.py
> > - copied unchanged from r5273, \
> > branches/consistency_tests_1.3/specific_fns/consistency_tests.py \
> > 1.3/test_suite/system_tests/consistency_tests.py
> > - copied unchanged from r5273, \
> > branches/consistency_tests_1.3/test_suite/system_tests/consistency_tests.py \
> > Modified: 1.3/ (props changed)
> >
>
> svnmerge is a bit retarted!!! This 'props changed' message means that
> the svnmerge properties have also been also been merged into the 1.3
> line. But these properties are the revisions of the 1.3 line which
> have been incorported into the branch! Hmmm, slightly problematic.
> I'll manually delete these properties to fix the issue. But in the
> mean time I've found how we should properly merge these branches back
> into 1.3 using svnmerge itself. See the section "Merging development
> branches back to trunk" at
> http://www.orcaware.com/svn/wiki/Svnmerge.py#Development_branches.
> Essentially, we need to type something like:
>
> $ svnmerge.py merge --bidirectional
>
> or:
>
> $ svnmerge.py merge --bidirectional -S BRANCH_NAME
>
> Then to close this prior to deleting the branch:
>
> $ svnmerge.py uninit -S BRANCH_NAME
>
> I should get these instructions into the manual and replace the whole
> of the 'svn merge' sections.
>
> Regards,
>
> Edward
>
> _______________________________________________
> relax (http://nmr-relax.com)
>
> This is the relax-devel mailing list
> relax-devel@domain.hid
>
> 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
>
>
[Attachment #3 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
</head>
<body bgcolor="#ffffff" text="#000000">
Hi Edward,<br>
<br>
Fine. Incorporating this new protocol in the manual will surely help
everyone in the future.<br>
<br>
Cheers<br>
<br>
<br>
Sébastien<br>
<br>
<br>
<br>
Edward d'Auvergne wrote:
<blockquote
cite="mid:7f080ed10804031204s3fe4318fj2ea7ed7a41858cd9@domain.hid"
type="cite">
<pre wrap="">Hi,
This merger appeared to be relatively successful. I have noticed one
problem caused by svnmerge, see below.
On Thu, Apr 3, 2008 at 8:11 PM, <a class="moz-txt-link-rfc2396E" \
href="mailto:sebastien.morin.1@domain.hid"><sebastien.morin.1@domain.hid></a> \
wrote: </pre>
<blockquote type="cite">
<pre wrap="">Author: semor
Date: Thu Apr 3 20:11:24 2008
New Revision: 5274
URL: <a class="moz-txt-link-freetext" \
href="http://svn.gna.org/viewcvs/relax?rev=5274&view=rev">http://svn.gna.org/viewcvs/relax?rev=5274&view=rev</a>
Log:
Merged the consistency tests branch back into the 1.3 line.
The command used was:
svn merge -r3321:HEAD <a class="moz-txt-link-abbreviated" \
href="mailto:svn+ssh://semor@domain.hid/">svn+ssh://semor@domain.hid/</a> .
The code is almost ready and further changes will not affect the rest of the code.
Added:
1.3/docs/latex/consistency_tests.tex
- copied unchanged from r5273, \
branches/consistency_tests_1.3/docs/latex/consistency_tests.tex \
1.3/maths_fns/consistency_tests.py
- copied unchanged from r5273, \
branches/consistency_tests_1.3/maths_fns/consistency_tests.py \
1.3/prompt/consistency_tests.py
- copied unchanged from r5273, \
branches/consistency_tests_1.3/prompt/consistency_tests.py \
1.3/sample_scripts/consistency_tests.py
- copied unchanged from r5273, \
branches/consistency_tests_1.3/sample_scripts/consistency_tests.py \
1.3/specific_fns/consistency_tests.py
- copied unchanged from r5273, \
branches/consistency_tests_1.3/specific_fns/consistency_tests.py \
1.3/test_suite/system_tests/consistency_tests.py
- copied unchanged from r5273, \
branches/consistency_tests_1.3/test_suite/system_tests/consistency_tests.py \
Modified: 1.3/ (props changed)
</pre>
</blockquote>
<pre wrap=""><!---->
svnmerge is a bit retarted!!! This 'props changed' message means that
the svnmerge properties have also been also been merged into the 1.3
line. But these properties are the revisions of the 1.3 line which
have been incorported into the branch! Hmmm, slightly problematic.
I'll manually delete these properties to fix the issue. But in the
mean time I've found how we should properly merge these branches back
into 1.3 using svnmerge itself. See the section "Merging development
branches back to trunk" at
<a class="moz-txt-link-freetext" \
href="http://www.orcaware.com/svn/wiki/Svnmerge.py#Development_branches">http://www.orcaware.com/svn/wiki/Svnmerge.py#Development_branches</a>.
Essentially, we need to type something like:
$ svnmerge.py merge --bidirectional
or:
$ svnmerge.py merge --bidirectional -S BRANCH_NAME
Then to close this prior to deleting the branch:
$ svnmerge.py uninit -S BRANCH_NAME
I should get these instructions into the manual and replace the whole
of the 'svn merge' sections.
Regards,
Edward
_______________________________________________
relax (<a class="moz-txt-link-freetext" \
href="http://nmr-relax.com">http://nmr-relax.com</a>)
This is the relax-devel mailing list
<a class="moz-txt-link-abbreviated" \
href="mailto:relax-devel@domain.hid">relax-devel@domain.hid</a>
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
<a class="moz-txt-link-freetext" \
href="https://mail.gna.org/listinfo/relax-devel">https://mail.gna.org/listinfo/relax-devel</a>
</pre>
</blockquote>
</body>
</html>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic