Re: [lmi] Proposed workflow for proprietary repository

[Vadim Zeitlin]

On Thu, 10 Mar 2016 13:39:39 +0000 "Murphy, Kimberly" <address@hidden> wrote:

MK> Creating the first patched initially tripped me up; it failed:
MK> 
MK> /usr/bin[0]$cd /opt/lmi/proprietary
MK> /opt/lmi/proprietary[0]$git rev-parse HEAD
MK> b5f2b3d4cfd179bbe4ac433d5bbe86d922bec2dc
MK> /opt/lmi/proprietary[0]$git am --committer-date-is-author-date \
MK> >     /opt/lmi/proprietary-patches/in/first.patch
MK> Patch format detection failed.

 The error message above is definitely unexpected. I initially thought that
this file ("first.patch") got corrupted somehow, but checking its MD5 sum
(thanks for providing it), it's the same here and the file looks fine to
me. Of course, I can't check if it applies to the repository, without
having it, but trying to apply it to another repository I get the expected
failures (the patch doesn't apply) rather than the error above.

MK> /opt/lmi/proprietary[128]$git rev-parse HEAD
MK> b5f2b3d4cfd179bbe4ac433d5bbe86d922bec2dc
MK> /opt/lmi/proprietary[0]$git am --committer-date-is-author-date \
MK> >     /opt/lmi/proprietary-patches/in/0002-Replace-svn-with-git.patch
MK> Applying: Replace 'svn' with 'git'
MK> /opt/lmi/proprietary[0]$git rev-parse HEAD
MK> 2f21e6bab9880387660333be301c9bfdccb23b79
MK> 
MK> No issues on later tries, only different sha1sums:

 This is to be expected because the first patch hasn't been applied, but
the second one was, so the history is now different and it will never
converge to the original one again.

 You should run "git reset --hard b5f2b3d4cfd179bbe4ac433d5bbe86d922bec2dc"
to return to the latest common revision and somehow convince "git am" to
apply the first patch. Unfortunately right now I have really no idea what
could possibly explain the "Patch format detection failed." error,
especially as it seems to have worked later. To be honest, my best hope is
that this error just goes away if you retry it again...

 So I'd recommend doing "git reset --hard b5f2b3d" above and then running
"git am --committer-data-is-author-date /path/to/first.patch" again. If it
works this time, then you should obtain the same SHA-1 as Greg and be able
to apply the second patch on top of it.

MK> /opt/lmi/proprietary[0]$git push
MK> Counting objects: 8, done.
MK> Delta compression using up to 8 threads.
MK> Compressing objects: 100% (8/8), done.
MK> Writing objects: 100% (8/8), 911 bytes | 0 bytes/s, done.
MK> Total 8 (delta 4), reused 0 (delta 0)
MK> To file:///opt/lmi/blessed/proprietary
MK>    b5f2b3d..8237ff2  master -> master

 Notice that you will now have to use "git push origin +HEAD" the next time
to force overwriting the (wrong) revisions in the bare repository with the
correct ones.

 Regards,
VZ