Skip to content
Permalink
Browse files

add ignore entry

  • Loading branch information...
stoecker committed Mar 25, 2018
1 parent c84316a commit 23c7f940656a3af2dc9d8e396de70d8fa910f154
Showing with 0 additions and 0 deletions.

5 comments on commit 23c7f94

@floscher

This comment has been minimized.

Copy link
Member

replied Mar 26, 2018

@stoecker Was this commit empty by accident and you wanted to actually change something? Or did this only change something (presumably svn:ignore) in the SVN repo, so I can drop this commit?

@stoecker

This comment has been minimized.

Copy link
Contributor Author

replied Mar 26, 2018

Was an ignore file update. It seems it is not copied into the corresponding git (.gitignore) files? But a svn checkout contains the line now, so somewhere this information must be stored.

@floscher

This comment has been minimized.

Copy link
Member

replied Mar 26, 2018

Ah, ok. No, svn:ignore properties can be converted to .gitignore files by git svn create-ignore. But this is not synced automatically.

According to https://help.github.com/articles/subversion-properties-supported-by-github/

GitHub will track them [ svn:ignore properties ] internally. Files ignored by subversion clients are completely distinct from entries in a .gitignore file.

When I checkout with SVN from https://github.com/JOSM/Mapillary/branches/trunk , the svn:ignore property ignores much less than the .gitignore file does:

build
bin
.gradle
javadoc

What did you change? Because I now rollback the trunk branch to previous commits, the svn:ignore property for the root directory stays the same.

@stoecker

This comment has been minimized.

Copy link
Contributor Author

replied Mar 26, 2018

What did you change?

Added last line.

So I need to always combine ignores with other changes to not create empty git commits. Will try to remember this.

@floscher

This comment has been minimized.

Copy link
Member

replied Mar 26, 2018

It seems that the changes are not tied to commits. You can create an empty commit like you did and then roll back the trunk branch to the commit before (git push -f origin origin/trunk^:trunk) and the changes to svn:ignore persist.

Unfortunately I wasn't able to find more documentation about this than I linked above. So it's more or less a game of trial and error.

Please sign in to comment.
You can’t perform that action at this time.