Page MenuHomeFreeBSD
Differential D10698

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

Authored by dbn on May 13 2017, 7:44 AM.
Tags
None
Referenced Files
F122386082: D10698.id28289.diff
Fri, Jul 4, 9:33 PM
Unknown Object (File)
Fri, Jul 4, 6:54 PM
Unknown Object (File)
Fri, Jun 27, 10:49 AM
Unknown Object (File)
Fri, Jun 27, 1:51 AM
Unknown Object (File)
Wed, Jun 25, 4:46 AM
Unknown Object (File)
Mon, Jun 23, 3:58 PM
Unknown Object (File)
Mon, Jun 23, 1:42 PM
Unknown Object (File)
Sun, Jun 22, 6:22 PM
View All Files
Subscribers
adamw
bapt
bdrewery
koobs
mat

Details

Reviewers
mat
Group Reviewers
portmgr
Commits
rP458023: Enhance .gitignore, svn:ingore and svn:global-ignores
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.

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

dbn created this revision.May 13 2017, 7:44 AM
Herald added a subscriber: mat. · View Herald TranscriptMay 13 2017, 7:44 AM
dbn updated this revision to Diff 28289.May 13 2017, 7:46 AM
dbn edited the summary of this revision. (Show Details)
adamw added a subscriber: adamw.May 13 2017, 3:17 PM

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

.gitignore
6

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

dbn retitled this revision from Enhance .gitignore to Enhance .gitignore, svn:ignore and svn:global-ignores.Dec 29 2017, 12:31 PM
dbn edited the summary of this revision. (Show Details)
dbn marked an inline comment as done.
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 added inline comments.Dec 29 2017, 12:46 PM
.gitignore
1

Can this actually happen and be a good thing ?

dbn added inline comments.Dec 29 2017, 12:52 PM
.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 added inline comments.Dec 29 2017, 1:07 PM
.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 updated this revision to Diff 37188.Dec 29 2017, 6:23 PM
dbn marked 4 inline comments as done.
dbn edited the summary of this revision. (Show Details)

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

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

dbn added a comment.Dec 29 2017, 6:29 PM

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 added a comment.Jan 2 2018, 2:58 PM

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 updated this revision to Diff 37469.Jan 3 2018, 6:55 PM

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

dbn edited reviewers, added: portmgr, mat; removed: koobs, bdrewery, bapt.Jan 3 2018, 6:56 PM
dbn edited subscribers, added: koobs, bdrewery, bapt; removed: portmgr.
mat accepted this revision as: portmgr.Jan 4 2018, 8:07 AM
This revision was not accepted when it landed; it landed in state Needs Review.Jan 4 2018, 11:41 AM
Closed by commit rP458023: Enhance .gitignore, svn:ingore and svn:global-ignores (authored by dbn). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
2 lines

Diff 28289

View Options

.

Loading...
View Options

.gitignore

Loading...