On Wed, Mar 8, 2017 at 10:06 AM, Christian Brabandt <[email protected]> wrote: > Hi Tony!
Hello Christian! > > On Mi, 08 Mär 2017, Tony Mechelynck wrote: > >> On Wed, Mar 8, 2017 at 9:52 AM, Dominique Pellé >> <[email protected]> wrote: >> > Tony Mechelynck wrote: >> > >> >> P.S. .hgignore is missing a few additional files, present in >> >> .gitignore. See attached the revised patch. >> > >> > Hi Tony >> > >> > There is no .hgignore file in the official vim git repository. >> > >> > Regards >> > Dominique >> >> No; but there is one in the Mercurial mirror, and the commit >> description mentions it. > > Oh, that was a task for me. Thanks. I included it. > > Best, > Christian > -- > Hundert graue Pferde machen nicht einen einzigen Schimmel. > -- Goethe, Maximen und Reflektionen, Nr. 1019 Bram said a .hgignore in the git master may cause problems, that's OK by me. Of course the hg mirror should have one. A vimdiff between .gitignore and .hgignore shows the following differences (in addition to the "syntax: glob" line mentioned by Bram): .gitignore line 8 (absent from .hgignore) src/objects/.dirstamp N.B. Shouldn't the whole src/objects directory be excluded? (It may have been left by a compile, to be reused in a future incremental compile, but we don't want Mercurial to track it, or anything in it, do we?) Hm, I suppose ignoring *.o for Unix and *.obj for Windows, plus this .dirstamp file, might be good enough The following line is present in both but a few lines apart: src/memfile_test In addition, I have the following in my "custom" .hgignore, you may or may not want them (And by the way, I didn't have to intervene manually to have these new changes correctly merged with mine shown below): line 60 between "# All platforms" and "*.rej" runtime/doc/tags N.B. With this line, in recent Mercurial versions I have to delete my local runtime/doc/tags whenever it is changed on the remote, otherwise Mercurial chokes on it. "make install" or even "make installruntime" recreate it anyway. At the very end, preceded by an empty line, the following allow building with no trouble in any number of shadow directories: # shadow directories # the directory names could be anything but we restrict them # to shadow (the default) or shadow-* src/shadow src/shadow-* # src/runtime and src/pixmaps are softlinks needed for proper 'make install' # when in a shadow directory src/runtime src/pixmaps # avoid tracking cscope.out even if built here src/cscope.out I'll attach a diff, you may pick and choose from it. I think it can be used as-is, though some lines may be redundant and/or not to everyone's taste. (I use 8 lines of context, the Mozilla convention, though many people are content with less than that.) Best regards, Tony. -- -- 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.
diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -2,16 +2,17 @@ syntax: glob # Unixen: object and executable files. *.o src/vim src/xxd/xxd src/auto/if_perl.c src/auto/gui_gtk_gresources.c src/auto/gui_gtk_gresources.h +src/objects/.dirstamp src/tags # We do need src/auto/configure. src/auto/config.aap src/auto/config.cache src/auto/config.h src/auto/config.log src/auto/config.mk @@ -52,16 +53,18 @@ bcc.cfg # NetBeans nbproject/* # Mac OSX src/xxd/xxd.dSYM # All platforms +runtime/doc/tags +src/objects *.rej *.orig *.mo *.swp *~ *.pyc *.log src/po/vim.pot @@ -79,8 +82,20 @@ src/testdir/test.log src/testdir/dostmp/* src/testdir/messages src/testdir/viminfo src/testdir/opt_test.vim src/json_test src/message_test src/kword_test src/memfile_test + +# shadow directories +# the directory names could be anything but we restrict them +# to shadow (the default) or shadow-* +src/shadow +src/shadow-* +# src/runtime and src/pixmaps are softlinks needed for proper 'make install' +# when in a shadow directory +src/runtime +src/pixmaps +# avoid tracking cscope.out even if built here +src/cscope.out
