Update .gitignore

[ktakat...@gmail.com]

Hi,

I think `src/po/LINGUAS` should be ignored:

--- a/.gitignore
+++ b/.gitignore
@@ -67,6 +67,7 @@ src/xxd/xxd.dSYM
*.pyc
*.log
src/po/vim.pot
+src/po/LINGUAS

# Generated by "make test"
src/po/*.ck

Regards,
Ken Takata

[Bram Moolenaar]

I think we can delete the file after running msgfmt.

--
BRIDGEKEEPER: What is your favorite editor?
GAWAIN: Emacs ... No, Viiiiiiiiiiimmmmmmm!
"Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD

/// Bram Moolenaar -- Br...@Moolenaar.net -- 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 ///

[Christian Brabandt]

On So, 05 Mai 2019, Bram Moolenaar wrote:

>
> Ken Takata wrote:
>
> > I think `src/po/LINGUAS` should be ignored:
> >
> > --- a/.gitignore
> > +++ b/.gitignore
> > @@ -67,6 +67,7 @@ src/xxd/xxd.dSYM
> > *.pyc
> > *.log
> > src/po/vim.pot
> > +src/po/LINGUAS
> >
> > # Generated by "make test"
> > src/po/*.ck
>
> I think we can delete the file after running msgfmt.

Should we include the .hgignore so it easier to keep in sync with the hg
mirror:
https://bitbucket.org/vim-mirror/vim/src/default/.hgignore

Best,
Christian
--
Drücken wir das Abbild der Ewigkeit auf unser Leben!
-- Friedrich Wilhelm Nietzsche (Also sprach Zarathustra)

[Bram Moolenaar]

Christian wrote:

> On So, 05 Mai 2019, Bram Moolenaar wrote:
>
> > Ken Takata wrote:
> >
> > > I think `src/po/LINGUAS` should be ignored:
> > >
> > > --- a/.gitignore
> > > +++ b/.gitignore
> > > @@ -67,6 +67,7 @@ src/xxd/xxd.dSYM
> > > *.pyc
> > > *.log
> > > src/po/vim.pot
> > > +src/po/LINGUAS
> > >
> > > # Generated by "make test"
> > > src/po/*.ck
> >
> > I think we can delete the file after running msgfmt.
>
> Should we include the .hgignore so it easier to keep in sync with the hg
> mirror:
> https://bitbucket.org/vim-mirror/vim/src/default/.hgignore

I actually have an .hgignore file, but it is not included in the git
repo, because it conflicts with the .gitignore file. There was a
discusison about this in the past.

--
Men may not be seen publicly in any kind of strapless gown.
[real standing law in Florida, United States of America]

[Christian Brabandt]

On Mo, 06 Mai 2019, Bram Moolenaar wrote:
>
> I actually have an .hgignore file, but it is not included in the git
> repo, because it conflicts with the .gitignore file. There was a
> discusison about this in the past.

I am not sure how it can conflict with the .gitignore file.

Since you already have the .hgignore file, I suggest to also check it
in, so I don't have to manually sync those 2 files.

But please let me know before you check it in, so I can remove the
current version, before my sync script tries to commit this to the
bitbucket server.

Before
Christian
--
F: Was ist eine Kuh mit einem Regenschirm?
A: Ein überspanntes Rindvieh.

[Bram Moolenaar]

Christian wrote:

> On Mo, 06 Mai 2019, Bram Moolenaar wrote:
> >
> > I actually have an .hgignore file, but it is not included in the git
> > repo, because it conflicts with the .gitignore file. There was a
> > discusison about this in the past.
>
> I am not sure how it can conflict with the .gitignore file.
>
> Since you already have the .hgignore file, I suggest to also check it
> in, so I don't have to manually sync those 2 files.
>
> But please let me know before you check it in, so I can remove the
> current version, before my sync script tries to commit this to the
> bitbucket server.

I thought there was a reason we can't include them both, but I can't
find it. There is only the cleanup script that was used when moving
from Google Code to Github.

I can add back .hgignore so that we have both. Let me know when you are
ready for it.

--
It is illegal for anyone to give lighted cigars to dogs, cats, and other
domesticated animal kept as pets.
[real standing law in Illinois, United States of America]

[Christian Brabandt]

On Mo, 06 Mai 2019, Bram Moolenaar wrote:

>
> Christian wrote:
>
> > On Mo, 06 Mai 2019, Bram Moolenaar wrote:
> > >
> > > I actually have an .hgignore file, but it is not included in the git
> > > repo, because it conflicts with the .gitignore file. There was a
> > > discusison about this in the past.
> >
> > I am not sure how it can conflict with the .gitignore file.
> >
> > Since you already have the .hgignore file, I suggest to also check it
> > in, so I don't have to manually sync those 2 files.
> >
> > But please let me know before you check it in, so I can remove the
> > current version, before my sync script tries to commit this to the
> > bitbucket server.
>
> I thought there was a reason we can't include them both, but I can't
> find it. There is only the cleanup script that was used when moving
> from Google Code to Github.
>
> I can add back .hgignore so that we have both. Let me know when you are
> ready for it.

Currently the used .hgignore file does a bit more than the current
.gitignore:


diff --git a/home/chrisbra/code/vim/.gitignore b/home/chrisbra/code/vim/.hgignore
index 85e482d..d750fcd 100644
--- a/home/chrisbra/code/vim/.gitignore
+++ b/home/chrisbra/code/vim/.hgignore
@@ -1,3 +1,5 @@
+syntax: glob
+
# Unixen: object and executable files.
*.o
src/vim
@@ -59,6 +61,8 @@ nbproject/*
src/xxd/xxd.dSYM

# All platforms
+runtime/doc/tags
+src/objects
*.rej
*.orig
*.mo
@@ -88,3 +92,15 @@ src/memfile_test
src/json_test
src/message_test
src/kword_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

So it might make sense to include those things (minus the syntax: glob)
also in .gitignore I leave that to you however.

I then tried to include the .gitignore file in .hgignore using

syntax: glob
include:.gitignore

That fails because hg then again expects perl like regexp patterns in
the include file :(

So I removed the current .hgignore file. Feel free to add your version
plus the parts from above back in and commit to the repository.

Best,
Christian
--
Alt bist du dann, wenn deine Ärzte jünger sind als du.
-- Gerhard Kocher

[ktakat...@gmail.com]

Hi Bram,

I have another proposal for the .gitignore file:

* .aap files have been deleted. We can remove the related items.
* Move *.map from "Borland C++" to "Windows". MSVC and MinGW may also generate
a map file.
* src/if_perl.c has been moved to src/auto/if_perl.c on Windows.
It is now the same as unix.
* Ignore nsis icon files when unpacking nsis/icons.zip.

Regards,
Ken Takata