Re: [lmi] lmi + wine-3.0 (Debian 3.0-1) = purple fungus

[Vadim Zeitlin]

On Sat, 21 Jul 2018 15:54:09 +0000 Greg Chicares <address@hidden> wrote:

GC> On 2018-07-20 14:47, Greg Chicares wrote:
GC> [...]
GC> > This was a working copy created 2018-04-11 and untouched since then
GC> > even though I upgraded wx just the other day; apparently it's a
GC> > leftover artifact of some earlier version of 'install_wx.sh':
GC> > 
GC> > /opt/lmi/src/lmi[0]$pushd /opt/lmi/vcs/wxWidgets                          
    
GC> > /opt/lmi/vcs/wxWidgets[0]$git show 
2a5aafb27419efb36999e24dbcc091eacea56286 |head -1
GC> > fatal: bad object 2a5aafb27419efb36999e24dbcc091eacea56286
GC> > 
GC> > ..and it probably predates that SHA1. Therefore, I've now done this:
GC> >   rm -rf /opt/lmi/vcs/
GC> > and the problem is presumably now fixed.
GC> 
GC> However, this exposes another problem (discovered promptly thanks to
GC> 'nychthemeral_test.sh'--don't know how I ever did without it)...
GC> 
GC> /opt/lmi/src/lmi[0]$./nychthemeral_test.sh 2>&1 | tee /tmp/lmi/logs/log | 
sed -f errors.sed
GC> Production system built--ready to start GUI test in another session.
GC> fatal: file not found: /opt/lmi/vcs/wxWidgets/misc/schema/xrc_schema.rnc 
(No such file or directory)
GC> 
GC> ...which is easily fixed, thus...
GC> 
GC> -include "/opt/lmi/vcs/wxWidgets/misc/schema/xrc_schema.rnc"
GC> +include "/cache_for_lmi/vcs/wxWidgets/misc/schema/xrc_schema.rnc"
GC> 
GC> ...in commit e5d282b8.

 It looks like this was the last occurrence of /opt/lmi/vcs in lmi sources.

GC> BTW, while modifying origin/master, I'm doing:
GC> 
GC>   git format-patch $(git merge-base master 
xanadu/pdf-pagination)..xanadu/pdf-pagination --stdout | git apply --check -
GC> 
GC> to make sure I don't commit anything that will cause merge problems
GC> with the remote pdf-pagination branch.

 I don't think you need to worry too much about this, it's probably simpler
to just commit whatever you need to commit and then resolve the conflicts
when merging or rebasing, rather than trying to avoid the conflicts
proactively, as the latter must be done manually while Git will do its best
to help with the former.

 Regards,
VZ