Argonne National Laboratory

Experimental Physics and
Industrial Control System

2002  2003  2004  2005  2006  2007  2008  2009  2010  <20112012  2013  2014  2015  2016  2017  2018  2019  Index 2002  2003  2004  2005  2006  2007  2008  2009  2010  <20112012  2013  2014  2015  2016  2017  2018  2019 
<== Date ==> <== Thread ==>

Subject: Re: [Merge] lp:~epics-core/epics-base/epicsR3.15-atomics into lp:epics-base
From: Andrew Johnson <anj@aps.anl.gov>
To: Jeff Hill <johill@lanl.gov>
Date: Thu, 01 Sep 2011 18:34:00 -0000
Review: Needs Fixing
Hi Jeff,

Unfortunately this branch cannot be merged easily.  The src/libCom/osi/compiler directory and all of its contents here do not share a history with their equivalents in the compiler-specific branch which I just merged.  This is the commit revid that did the mkdir operation here:
    revid:johill@lanl.gov-20110805151338-cqeavj57hk6vsgn9

This is the revid from the compiler-specific branch:
    revid:johill@lanl.gov-20110817195746-wkwnylqxo7r00jrd

As a result, Bazaar thinks they are separate directories and won't merge the file contents.  You can't play fast-and-loose with this kind of thing like we did with CVS; if you don't follow its rules you don't get to use its nice features.

I can merge the atomics code by losing all your commit history on this branch, but your epicsThreadOnce-atomics-based branch will have similar difficulties since it's based off this branch.  I suggest you stop further development until we've worked out how to proceed.

- Andrew

-- 
https://code.launchpad.net/~epics-core/epics-base/epicsR3.15-atomics/+merge/73613
Your team EPICS Core Developers is subscribed to branch lp:~epics-core/epics-base/3.15-buildCompilerSpecific.


References:
[Merge] lp:~epics-core/epics-base/epicsR3.15-atomics into lp:epics-base Jeff Hill

Navigate by Date:
Prev: [Merge] lp:~epics-core/epics-base/3.15-buildCompilerSpecific into lp:epics-base noreply
Next: Re: [Merge] lp:~epics-core/epics-base/epicsR3.15-atomics into lp:epics-base Andrew Johnson
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  <20112012  2013  2014  2015  2016  2017  2018  2019 
Navigate by Thread:
Prev: Re: [Merge] lp:~epics-core/epics-base/epicsR3.15-atomics into lp:epics-base Jeff Hill
Next: Re: [Merge] lp:~epics-core/epics-base/epicsR3.15-atomics into lp:epics-base Andrew Johnson
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  <20112012  2013  2014  2015  2016  2017  2018  2019 
ANJ, 02 Feb 2012 Valid HTML 4.01! · Home · News · About · Base · Modules · Extensions · Distributions · Download ·
· Search · EPICS V4 · IRMIS · Talk · Bugs · Documents · Links · Licensing ·