[haiku-development] Updating by git if I modify some files in haiku tree?

  • From: "Thomas Mueller" <mueller6723@xxxxxxx>
  • To: haiku-development@xxxxxxxxxxxxx
  • Date: Thu, 11 May 2017 20:51:14 +0000

If I modify some files in haiku tree, would they be overwritten when I run "git 
pull" and there is an upstream update for one or more of those files?

I keep Haiku trees in ~/haiku directory with subdirectories haiku, buildtools, 
haikuporter, haikuports.cross and haikuports.

I would want to modify some of those files that contain the string 
HOST_PLATFORM, and would put a copy of everything I changed somewhere else for 
safekeeping so I could restore and merge as needed.

From ~/haiku directory, I run
grep -Rn "HOST_PLATFORM" 2>&1 | tee HOST_PLATFORM.lst 
if I am running sh or bash shell, or
grep -Rn "HOST_PLATFORM" |& tee HOST_PLATFORM.lst
if I am running csh or tcsh shell.

I would want to get all upstream updates and make changes if needed after 
rerunning grep search for HOST_PLATFORM string.

Purpose of this would be to see if I could adapt for NetBSD while not upsetting 
anything for other HOST_PLATFORMs.

This is really a question about git, where what I think should happen might be 
at variance with how git actually works.  I am trying to avoid messing up.

Tom


Other related posts: