Re: [lmi] [PATCH] Use submodules for, and newer versions of, libxml2 and libxslt

[Greg Chicares]

On 2020-09-30 14:39, Vadim Zeitlin wrote:
> On Wed, 30 Sep 2020 13:28:23 +0000 Greg Chicares <gchicares@sbcglobal.net> 
> wrote:
> 
> GC> On 2020-09-29 23:57, Vadim Zeitlin wrote:
> GC> >  Here is, finally, the promised patch:
> GC> > 
> GC> >         https://github.com/vadz/lmi/pull/153
> GC> 
> GC> Two questions:
> GC> 
> GC> (1) Is this a correct way of incorporating that PR into lmi?
> GC>   [where "xanadu" is your github repository]
> GC>   git fetch xanadu
> GC>   git merge xanadu/submodule-for-xml-libs
> 
>  Yes, absolutely. However we've found a mistake in the first commit. For
> now I've pushed it to the same PR (so now it should have 3 commits instead
> of 2), but if you don't mind, I'd like to rebase it to merge it into the
> first commit. Please let me know if I can do this -- this would rewrite the
> existing commits, so you would need to redo "git fetch xanadu" again, but
> if you haven't merged this branch yet, this shouldn't be a problem. If you
> did already merge it, it's probably not worth the trouble and I'll have to
> consign the record of my inattentiveness to the annals of history.

Reading this in full on a less hectic day, I'll mention that I had already
merged the branch, but not pushed it. However, adapting to your forced
changes is either
 - so easy because of my git-fu that I could do it in my sleep, even
   with a postoperative infection, or
 - so hard because of my lack of git-fu that I must practice until it
   becomes easy.
I won't say which of those is more true, but I'll say what I did.

# Fetch rebased remote

$git fetch xanadu
remote: Enumerating objects: 10, done.
remote: Counting objects: 100% (10/10), done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 10 (delta 4), reused 10 (delta 4), pack-reused 0
Unpacking objects: 100% (10/10), done.
>From https://github.com/vadz/lmi
 + 5395409f...d217f203 submodule-for-xml-libs -> xanadu/submodule-for-xml-libs  
(forced update)

# Move files affected by unpushed merge aside (just because I want to)
# It doesn't matter that one had been deleted

$mkdir /opt/lmi/stash/submod
$mv -v $(git diff --name-only origin/master) /opt/lmi/stash/submod
renamed '.gitmodules' -> '/opt/lmi/stash/submod/.gitmodules'
mv: cannot stat 'install_libxml2_libxslt.make': No such file or directory
renamed 'install_libxml2_libxslt.sh' -> 
'/opt/lmi/stash/submod/install_libxml2_libxslt.sh'
renamed 'install_msw.sh' -> '/opt/lmi/stash/submod/install_msw.sh'
renamed 'third_party/libxml2' -> '/opt/lmi/stash/submod/libxml2'
renamed 'third_party/libxslt' -> '/opt/lmi/stash/submod/libxslt'

# Restore the files just moved
git ls-files --deleted | xargs -t git checkout --

# Drop unpushed merge, interactively changing each commit to "drop"
# This is like 'git reset [some-argument]', but I can see what I'm doing

$git rebase --interactive
Successfully rebased and updated refs/heads/master.

# Now it's as though that xanadu merge had never occurred
# Note: the bogus valyuta/003 must be destroyed

$git --no-pager log -1 --oneline
f94663e9 (HEAD -> master, xanadu/master, origin/valyuta/003, origin/master, 
origin/HEAD, valyuta/003) Add a script that's not ready to use

# Repeat the merge

git merge xanadu/submodule-for-xml-libs

# Take a look

$git status
On branch master
Your branch is ahead of 'origin/master' by 3 commits.
  (use "git push" to publish your local commits)

$git log -4
$git --no-pager log -4 --oneline
d217f203 (HEAD -> master, xanadu/submodule-for-xml-libs) Fix GitHub CI to use 
lib{xml2,xslt} submodules
849b4ba4 Upgrade libxlst submodule to build with MinGW 10.1
3142bfe7 Add lib{xml2,xslt} submodules; use them in the new build script
f94663e9 (xanadu/master, origin/valyuta/003, origin/master, origin/HEAD, 
valyuta/003) Add a script that's not ready to use

# View changes with any tool
# e.g., a gui tool [on the host] that allows directory navigation
# it's not very helpful here, but the freedom to use it is important

$meld /srv/chroot/bullseye0/opt/lmi/src/lmi 
/srv/chroot/bullseye0/opt/lmi/stash/submod

# Clean up an unwanted subdirectory and an unwanted branch
# [removal of /opt/lmi/stash/submod/ performed but not shown here]

$git branch --delete valyuta/003
Deleted branch valyuta/003 (was f94663e9).
$git --no-pager log -4 --oneline
d217f203 (HEAD -> master, xanadu/submodule-for-xml-libs) Fix GitHub CI to use 
lib{xml2,xslt} submodules
849b4ba4 Upgrade libxlst submodule to build with MinGW 10.1
3142bfe7 Add lib{xml2,xslt} submodules; use them in the new build script
f94663e9 (xanadu/master, origin/valyuta/003, origin/master, origin/HEAD) Add a 
script that's not ready to use