[Rivet] [Rivet-svn] rivet: Merge

[Holger Schulz]

Hi David,

since my changes were so atomic in the end I simply checked out the
repository again.

Thanks,
Holger


On 03/10/16 15:04, David Grellscheid wrote:
> Hi Holger,
>
> as long as this commit is just local on your machine, the following
> should work:
>
> hg rollback
> hg summ # should show 5549:0ee33b1e451c
> hg up -r 7181e7acdc1a
> hg commit -m'3 more inspireID fixes'
>
> Let me know if it works.
>
>   David
>
>
>
> On 03/10/2016 14:28, Holger Schulz wrote:
>> I think I did it again.
>>
>> I now have these two heads:
>>
>>
>>     changeset:   5552:83766679b782
>>     branch:      release-2-5-x
>>     tag:         tip
>>     parent:      5549:0ee33b1e451c
>>     user:        Holger Schulz <holger.schulz at durham.ac.uk>
>>     date:        Mon Oct 03 14:23:02 2016 +0100
>>     summary:     3 more inspireID fixes
>>
>>     changeset:   5551:7181e7acdc1a
>>     branch:      release-2-5-x
>>     parent:      5548:118748e0a78f
>>     user:        David Grellscheid <david.grellscheid at durham.ac.uk>
>>     date:        Mon Oct 03 14:19:40 2016 +0100
>>     summary:     correct 2-5-x head after mismerge
>>
>>
>> This is what the glog looks like:
>>
>>     @  changeset:   5552:83766679b782
>>     |  branch:      release-2-5-x
>>     |  tag:         tip
>>     |  parent:      5549:0ee33b1e451c
>>     |  user:        Holger Schulz <holger.schulz at durham.ac.uk>
>>     |  date:        Mon Oct 03 14:23:02 2016 +0100
>>     |  summary:     3 more inspireID fixes
>>     |
>>     | o  changeset:   5551:7181e7acdc1a
>>     | |  branch:      release-2-5-x
>>     | |  parent:      5548:118748e0a78f
>>     | |  user:        David Grellscheid <david.grellscheid at durham.ac.uk>
>>     | |  date:        Mon Oct 03 14:19:40 2016 +0100
>>     | |  summary:     correct 2-5-x head after mismerge
>>     | |
>>     +---_  changeset:   5550:89f572acaa99
>>     | |    branch:      release-2-5-x
>>     | |    user:        David Grellscheid
>> <david.grellscheid at durham.ac.uk>
>>     | |    date:        Mon Oct 03 14:18:42 2016 +0100
>>     | |    summary:     closed mis-merge
>>     | |
>>     o |  changeset:   5549:0ee33b1e451c
>>     |\|  branch:      release-2-5-x
>>     | |  parent:      5548:118748e0a78f
>>     | |  parent:      5547:c258d1504036
>>     | |  user:        Holger Schulz <holger.schulz at durham.ac.uk>
>>     | |  date:        Mon Oct 03 13:46:32 2016 +0100
>>     | |  summary:     Merge
>>
>>
>>
>> I am definitely on the 2-5-x branch.
>>
>> I don't know what to do now.
>>
>> Holger
>>
>>
>>
>> On 03/10/16 14:21, David Grellscheid wrote:
>>> OK, sorted.
>>>
>>>   David
>>>
>>>
>>> On 03/10/2016 14:14, David Grellscheid wrote:
>>>> Hi Holger,
>>>>
>>>> I think you mis-merged just now. We do not want trunk features on the
>>>> release branch. I'll sort this out.
>>>>
>>>>   David
>>>>
>>>>
>>>> On 03/10/2016 14:00, Rivet Mercurial wrote:
>>>>> details:   https://rivet.hepforge.org/hg/rivet/rev/0ee33b1e451c
>>>>> branches:  release-2-5-x
>>>>> changeset: 5549:0ee33b1e451c
>>>>> user:      Holger Schulz <holger.schulz at durham.ac.uk>
>>>>> date:      Mon Oct 03 13:46:32 2016 +0100
>>>>> description:
>>>>> Merge
>>>>>
>>>>> diffs (truncated from 845 to 50 lines):
>>>>>
>>>>> --- a/configure.ac    Mon Oct 03 13:44:52 2016 +0100
>>>>> +++ b/configure.ac    Mon Oct 03 13:46:32 2016 +0100
>>>>> @@ -1,7 +1,7 @@
>>>>>  ## Process this file with autoconf to produce a configure script.
>>>>>
>>>>>  AC_PREREQ(2.59)
>>>>> -AC_INIT([Rivet],[2.5.2],[rivet at projects.hepforge.org],[Rivet])
>>>>> +AC_INIT([Rivet],[trunk],[rivet at projects.hepforge.org],[Rivet])
>>>>>
>>>>>  ## Check and block installation into the src/build dir
>>>>>  if test "$prefix" = "$PWD"; then
>>>>> --- /dev/null    Thu Jan 01 00:00:00 1970 +0000
>>>>> +++ b/data/anainfo/MC_CENTRALITY.info    Mon Oct 03 13:46:32 2016
>>>>> +0100
>>>>> @@ -0,0 +1,10 @@
>>>>> +Name: MC_CENTRALITY
>>>>> +Summary: Template analysis for using CentralityHistogram
>>>>> +Status: UNVALIDATED
>>>>> +Authors:
>>>>> + - Leif Lönnblad <leif.lonnblad at thep.lu.se>
>>>>> +NumEvents: 50000
>>>>> +RunInfo: Any!
>>>>> +Description:
>>>>> +   Template analysis for using CentralityHistogram for dynamically
>>>>> +   determining centrality intervals using summed eT in the forward
>>>>> region.
>>>>> --- a/data/anainfo/Makefile.am    Mon Oct 03 13:44:52 2016 +0100
>>>>> +++ b/data/anainfo/Makefile.am    Mon Oct 03 13:46:32 2016 +0100
>>>>> @@ -310,6 +310,7 @@
>>>>>    LHCB_2014_I1281685.info \
>>>>>    LHCB_2015_I1333223.info \
>>>>>    LHCF_2012_I1115479.info \
>>>>> +  MC_CENTRALITY.info \
>>>>>    MC_DIPHOTON.info \
>>>>>    MC_ELECTRONS.info \
>>>>>    MC_GENERIC.info \
>>>>> --- /dev/null    Thu Jan 01 00:00:00 1970 +0000
>>>>> +++ b/data/plotinfo/MC_CENTRALITY.plot    Mon Oct 03 13:46:32 2016
>>>>> +0100
>>>>> @@ -0,0 +1,72 @@
>>>>> +# BEGIN PLOT /MC_CENTRALITY/ETfwd
>>>>> +Title=Sum $E_T$ distribution
>>>>> +XLabel=$\sum E_T$
>>>>> +YLabel=$1/\sigma \; \mathrm{d}\sigma/\mathrm{d}\sum E_T$
>>>>> +# END PLOT
>>>>> +
>>>>> +# BEGIN PLOT /MC_CENTRALITY/EtaAll
>>>>> +Title=Charged pseudo-rapidity distribution
>>>>> +XLabel=$\eta$
>>>>> +YLabel=$1/\sigma \; \mathrm{d}\sigma/\mathrm{d}\eta$
>>>>> +# END PLOT
>>>>> +
>>>>> +# BEGIN PLOT /MC_CENTRALITY/EtaC95
>>>>> _______________________________________________
>>>>> Rivet-svn mailing list
>>>>> Rivet-svn at projects.hepforge.org
>>>>> https://www.hepforge.org/lists/listinfo/rivet-svn
>>>>>
>>> _______________________________________________
>>> Rivet mailing list
>>> Rivet at projects.hepforge.org
>>> https://www.hepforge.org/lists/listinfo/rivet
>>
>>