EPICS Controls Argonne National Laboratory

Experimental Physics and
Industrial Control System

2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  <20142015  2016  2017  2018  2019  2020  2021  2022  Index 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  <20142015  2016  2017  2018  2019  2020  2021  2022 
<== Date ==> <== Thread ==>

Subject: Re: caPutLog support for gateway
From: "Konrad, Martin" <[email protected]>
To: Andrew Johnson <[email protected]>, "[email protected]" <[email protected]>
Date: Wed, 2 Apr 2014 18:14:09 +0000
Hi,
can anyone explain why Launchpad always screws up the merge request (it 
seems to me like it tries to re-merge the whole history)?

When I look at the diff [1] I wonder where Launchpad takes the 
timestamps from. Note that both timestamps (old file and new file) are 
wrong. This is what bzr says on my local repo:

$ bzr log|head -n 13
------------------------------------------------------------
revno: 181
git commit: da79ec8f8ff08f6335f959f1cde2eb27573946ee
author: John Priller <[email protected]>
committer: Martin Konrad <[email protected]>
timestamp: Thu 2014-03-27 15:15:01 -0400
message:
   Add option to compile in and use caPutLog
------------------------------------------------------------
revno: 180
git commit: 99d906eb3218ad614e0684082cf9f46c6bf5f15f
committer: Janet B. Anderson <[email protected]>
timestamp: Tue 2011-04-05 21:28:22 +0000

Martin

[1] 
https://code.launchpad.net/~info-martin-konrad/epics-gateway/putlog/+merge/213895

-- 
Martin Konrad
Control System Engineer
Facility for Rare Isotope Beams
Michigan State University
640 South Shaw Lane
East Lansing, MI 48824-1321, USA
Tel. 517-908-7253
Email: [email protected]


Replies:
Re: caPutLog support for gateway Andrew Johnson
References:
caPutLog support for gateway Konrad, Martin
Re: caPutLog support for gateway Konrad, Martin

Navigate by Date:
Prev: Re: caPutLog support for gateway Konrad, Martin
Next: Re: caPutLog support for gateway Andrew Johnson
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  <20142015  2016  2017  2018  2019  2020  2021  2022 
Navigate by Thread:
Prev: Re: caPutLog support for gateway Konrad, Martin
Next: Re: caPutLog support for gateway Andrew Johnson
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  <20142015  2016  2017  2018  2019  2020  2021  2022 
ANJ, 16 May 2014 Valid HTML 4.01! · Home · News · About · Base · Modules · Extensions · Distributions · Download ·
· Search · EPICS V4 · IRMIS · Talk · Bugs · Documents · Links · Licensing ·