EPICS Home EPICS Controls Argonne National Laboratory

Experimental Physics and
Industrial Control System

Format page
for printing


Search Tech-talk
2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  2019  <2020>  2021  2022  2023  2024  Index 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  2019  <2020>  2021  2022  2023  2024 
<== Date ==> <== Thread ==>
Subject: Re: another git question
From: Ralph Lange via Core-talk <core-talk at aps.anl.gov>
To: EPICS Core Talk <core-talk at aps.anl.gov>
Date: Fri, 20 Nov 2020 10:44:21 +0100
Hi Dirk,

On Fri, 20 Nov 2020 at 10:09, Zimoch Dirk (PSI) via Core-talk <core-talk at aps.anl.gov> wrote:

Thanks for the suggestion. But I doubt that I can easily undo the whole "let's move the whole libCom directory into a completely different location" which had been done for EPICS 7.


Actually, you would only need to temporarily move back the files that git complains about.
  

I do not understand why git claims that the file had been deleted instead of moved. Is this how the move had been done? Delete eveything and then add everything again?


For git, moving a file *is* deleting and adding. See https://stackoverflow.com/questions/1094269/whats-the-purpose-of-git-mv for a longer discussion on that topic.

No history from before the move. It seems that git has no idea that EPICS 7 modules/libcom/src/osi/os/posix/osdMutex.c has anything to do with EPICS 3 src/libCom/osi/os/posix/osdMutex.c


Git has to always check and re-consider if deletions and adds are actually moves or not. That's why you can fine-tune the recognition parameters at the time of your later command.

Another problem was that the commit contained files in libCom _and_ a file in configure so that not all paths changed the same way.


As long as you first move all affected files into their original places, this is covered.

Cheers,
~Ralph

References:
Re: another git question Yendell, Gary (DLSLtd, RAL, LSCI) via Core-talk
AW: another git question Zimoch Dirk (PSI) via Core-talk
Navigate by Date:
Prev: Re: AW: Problems with hanging osiSockTest Ralph Lange via Core-talk
Next: Build failed: EPICS Base 7 base-7.0-103 AppVeyor via Core-talk
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  2019  <2020>  2021  2022  2023  2024 
Navigate by Thread:
Prev: AW: another git question Zimoch Dirk (PSI) via Core-talk
Next: Build failed: epics-base base-integration-600 AppVeyor via Core-talk
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  2019  <2020>  2021  2022  2023  2024 
ANJ, 20 Nov 2020 Valid HTML 4.01! · Home · News · About · Base · Modules · Extensions · Distributions · Download ·
· Search · EPICS V4 · IRMIS · Talk · Bugs · Documents · Links · Licensing ·