Enhance .gitignore, svn:ignore and svn:global-ignores

[dbn]

Summary

• Ignore working directories (and the flavored versions)
• Ignore Makefile.local files
• Synchronize the ignored files/directories between git and subversion [1]

[1] Due to limitations with subversion, some of the ignored files and directories are more broad than in git. As a result, ports with a name "work" or starting with "work-" will be ignored.

[adamw]

Also, consider adding /*/*/Makefile.local.

.gitignore

6

svn-commit.tmp can appear in other directories, no? Should this be **/svn-commit.tmp?

[dbn]

In D10698#221845, @adamw wrote:

Also, consider adding /*/*/Makefile.local.

Thanks, added

Note: in .gitignore if a line doesn't start with "/" then it implies "**/", thus no need to change "svn-commit.tmp" line.

[mat]

.gitignore

1

Can this actually happen and be a good thing ?

[dbn]

.gitignore

1

It does for me, but I am happy to say I have a unique workflow (i.e. remove this from the patch, and the corresponding .git from svn:ignore?).

To explain my case: I have a partial checkout of ports using subversion, then do my development and keep track of the changes in git. Once I am happy with the changes I then bundle them all up and do a subversion commit. This is especially useful for big changes like mono updated that take weeks to mature.

[mat]

.gitignore

1

Mmm, I do all my development and committing from git, the only time I go to svn is when I move files around and git does not get it because its heuristics are not good enough, or if I move directories around, which git doesn't understand.

I do not think that saying "hey, you can have a Subversion checkout and a Git checkout at the same place" is a good thing, it will screw people up big time, so, yes, please remove .svn from here, and I think the svn:ignore already in Subversion is correct.

6

Also, there should never be a svn-commit*.tmp as this is git. But I guess it can happen in your unique workflow. I am unsure this is warranted either.

[dbn]

Apologies, it looks like I didn't update the patch :-(.

Attached, to reflect the changes to the summary, incorporating your suggested changes.

[dbn]

P.S. Phabricator isn't doing a great job of showing the changes to the subversion attributes. The unified diff looks like this:

--- .   (revision 455899)
+++ .   (working copy)

Property changes on: .
___________________________________________________________________
Added: svn:global-ignores
## -0,0 +1,8 ##
+Makefile.local
+work
+work-*
+svn-commit.tmp
+*~
+*.rej
+*.orig
+*.sw[p-z]
Modified: svn:ignore
## -1,2 +1,3 ##
 distfiles
 packages
+INDEX-[0-9]*

[mat]

svn-commit.tmp should probably be svn-commit*.tmp I think if you already have svn-commit.tmp it creates a svn-commit2.tmp, etc.

[dbn]

Enhance ignoring of svn-commit*.tmp and align ignored work directories between git and subversion.