Tony wrote:
> > > Now the make succeeds, but I have another problem: runtime/vim.desktop > > > and runtime/gvim.desktop have just been modified below my clone, which > > > means that the next time I try to pull the changes, Mercurial will > > > refuse to do it, because I have "uncommitted changes". > > > > > > So what should I do in order not to have to clone everything from > > > scratch whenever there are changes? > > > > Add this line to .gitignore and/or .hgignore: > > > > src/po/*.desktop > > These are not the uncommitted changes. The uncommitted changes are > runtime/*.desktop, both of which where both created by "hg clone" and > later modified by "make" if configured with +multi_lang i.e. > --with-features=normal or better. This means even running make inside > a shadowdir can modify version-controlled files outside the shadowdir. > However, AFAICT (by means of "parking" the changes made by "make" in > an mq patch, popped while pulling and pushed while compiling) once the > duplicate lines have been removed those files are not touched again by > make (e.g. their moddates don't change), so I ran "hg qfinish", > committing the removal of duplicate lines as a "local change". (I have > two other "local changes", one in src/feature.h to set +xterm_save and > the other in .hgtags to define v8.1.1153 where it belongs.) This way I > have the master's changesets in one uninterruped chain (with the same > CSIDs but different CS sequence numbers) plus a parallel "local > version" containing the local changes, into which the latest changes > are merged after every pull (thanks to the fetch extension, in fact), > and which is the source used in the compile-and-link phase in each of > my shadow directories. > > We'll see if this is enough to make Mercurial happy again. I think it will. During build the generated vim.desktop and gvim.desktop are copied to the runtime directory. That's not a good idea. But we need those files for "make install". Let's adjust the "make install" commands to use the po/*.desktop files if they exists, and otherwise user the runtime/*.desktop files as before. -- Mental Floss prevents moral decay! /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
