Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new: use .{git,hg}ignore syntax that's also understood by Mercurial #1247

Merged
merged 1 commit into from
Jan 29, 2015
Merged

new: use .{git,hg}ignore syntax that's also understood by Mercurial #1247

merged 1 commit into from
Jan 29, 2015

Conversation

tshepang
Copy link
Member

No description provided.

@alexcrichton
Copy link
Member

@bors: r+ 087bc40 thanks!

@alexcrichton
Copy link
Member

@bors: r+ 087bc40

@bors
Copy link
Contributor

bors commented Jan 29, 2015

⌛ Testing commit 087bc40 with merge 59f1906...

@bors
Copy link
Contributor

bors commented Jan 29, 2015

💔 Test failed - cargo-win-64

@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Jan 29, 2015

⌛ Testing commit 087bc40 with merge 174d232...

@bors
Copy link
Contributor

bors commented Jan 29, 2015

☀️ Test successful - cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-32, cargo-win-64

@bors bors merged commit 087bc40 into rust-lang:master Jan 29, 2015
@tshepang tshepang deleted the hgignore-love branch January 29, 2015 21:12
weihanglo added a commit to weihanglo/cargo that referenced this pull request Feb 11, 2022
Have traced down the issue. It feel like the original intent is to
ignore `Cargo.lock` and `target` at project root but not subdirectories.

1. The original implementation did ignore root `/Cargo.lock`.
   rust-lang#321
2. Someday one wanted to support both gitignore and hgingore's syntax
   and removed the leading slash.
   rust-lang#1247
3. Later, one found that we should not ignore `target` other than
   under root directory and added `/target` back.
   rust-lang#4099
4. It turns out that the syntax is not compatible between gitignore
   and hgignore. Therefore, one started to use hgignore special syntax
   to handle `Cargo.lock`.
   rust-lang#4342

This commit rollbacks to what original implementation tries to do.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants