AW: another git question

["Zimoch Dirk \(PSI\) via Core-talk" <core-talk at aps.anl.gov>]

Hello Gary,

 

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.

 

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?  It seems so as 'git log modules/libcom/src/osi/os/posix/osdMutex.c' staryts with

 

commit 833648c97762c404bd44f1eddf9174cdd396dcc4

Author: Ralph Lange <ralph.lange at gmx.de>

Date:   Tue Jun 19 11:24:03 2018 +0200

 

    Move all under modules/libcom

 

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

 

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

 

I have now applied all changes manually for each individual file. I had to modify several things anyway because of changes from EPICS 3 to 7.

 

Cheers,

Dirk

 

Von: Yendell, Gary (DLSLtd,RAL,LSCI) <gary.yendell at diamond.ac.uk>
Gesendet: Freitag, 20. November 2020 09:55
An: Zimoch Dirk (PSI) <dirk.zimoch at psi.ch>
Cc: core-talk at aps.anl.gov
Betreff: Re: another git question

 

Hi Dirk,

 

You may want to play around with the find renames option on the cherry-pick commands [1]. This adjusts the allowed % difference between two files for them to be considered renamed, rather than deleted and created.

 

If that doesn't work, you could

• Rename the file to match the branch you are cherry picking from - Commit 1
• Do the cherry-pick - Commit 2
• Revert Commit 1 - Commit 3
• Squash Commits 1-3

Possibly this could be scripted if it is the only thing that works and you need to do it frequently.

 

[1] https://git-scm.com/docs/git-merge#Documentation/git-merge.txt-find-renamesltngt

 

(Apologies if this email doesn't come through properly, I am only subscribed to core talk by RSS, so I didn't have an email to reply to.)

 

Cheers,

Gary

 

-- 

This e-mail and any attachments may contain confidential, copyright and or privileged material, and are for the use of the intended addressee only. If you are not the intended addressee or an authorised recipient of the addressee please notify us of receipt by returning the e-mail and do not use, copy, retain, distribute or disclose the information in or attached to the e-mail.
Any opinions expressed within this e-mail are those of the individual and not necessarily of Diamond Light Source Ltd.
Diamond Light Source Ltd. cannot guarantee that this e-mail or any attachments are free from viruses and we cannot accept liability for any damage which you may sustain as a result of software viruses which may be transmitted in or with the message.
Diamond Light Source Limited (company no. 4375679). Registered in England and Wales with its registered office at Diamond House, Harwell Science and Innovation Campus, Didcot, Oxfordshire, OX11 0DE, United Kingdom