[gmx-developers] Merge enforced rotation branch into master

[Berk Hess]

On 11/17/2010 11:33 AM, Carsten Kutzner wrote:
> On Nov 16, 2010, at 10:42 PM, hess at sbc.su.se wrote:
>
>   
>> Hi,
>>
>> A question on the mdp/inputrec options.
>> I hope these are hidden when you don't use this, as for normal pull options.
>>     
> Hi Berk,
>
> rotation options are analogous to pull options. The only extra
> mdp option that is always there is of course
>
> rotation = yes / no
>
> I can also make the rotation output files in the mdrun file list hidden.
>
> Carsten
>   
I thought rotation was a sub option of the pull options, but apparently
it is not.
How does it interact will the pull options then?
Can you use pulling and rotation simultaneously?
I guess it should work fine when you pull and rotate the same groups,
but they could interfere when the groups overlap partially.

PS I would like to change the pull groups such that there is not by
definition
a single reference group, but that can define general pairs.

Berk
>
>   
>> Berk
>>
>>     
>>> On Tue, Nov 16, 2010 at 17:58, Carsten Kutzner <ckutzne at gwdg.de> wrote:
>>>       
>>>> can I do a
>>>> git checkout master; git merge release-4-5-patches; git push
>>>> such that the master gets all the pending fixes from the
>>>> 4.5 branch?
>>>>         
>>> It depends a bit on the context whether that works.  Assuming that you
>>> have all the tracking branches created, what should work in all
>>> situations is the following sequence:
>>>  git checkout release-4-5-patches
>>>  git pull
>>>  git checkout master
>>>  git pull
>>>  git merge release-4-5-patches
>>>  git push
>>> Or alternatively, assuming that your remote repository has the default
>>> name,
>>>  git checkout master
>>>  git pull
>>>  git merge origin/release-4-5-patches
>>>  git push
>>> which gives identical history, but a bit different commit message on
>>> the merge (that can also be edited manually).
>>>
>>> Teemu
>>> --
>>> gmx-developers mailing list
>>> gmx-developers at gromacs.org
>>> http://lists.gromacs.org/mailman/listinfo/gmx-developers
>>> Please don't post (un)subscribe requests to the list. Use the
>>> www interface or send it to gmx-developers-request at gromacs.org.
>>>
>>>       
>> -- 
>> gmx-developers mailing list
>> gmx-developers at gromacs.org
>> http://lists.gromacs.org/mailman/listinfo/gmx-developers
>> Please don't post (un)subscribe requests to the list. Use the 
>> www interface or send it to gmx-developers-request at gromacs.org.
>>     
>
>
>
>