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

Check applying patches with tabulations #1491

Open
Tracked by #2308
MementoRC opened this issue Mar 15, 2025 · 0 comments
Open
Tracked by #2308

Check applying patches with tabulations #1491

MementoRC opened this issue Mar 15, 2025 · 0 comments

Comments

@MementoRC
Copy link

MementoRC commented Mar 15, 2025

Oddly a simple patch:

--- a/Renode_NET.sln.orig
+++ b/Renode_NET.sln
@@ -718,4 +718,4 @@
 		{B83F88C1-35CB-4A41-A1B2-3EA252300C11}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B83F88C1-35CB-4A41-A1B2-3EA252300C11}.ReleaseHeadless|Any CPU.ActiveCfg = Debug|Any CPU
-		{B83F88C1-35CB-4A41-A1B2-3EA252300C11}.ReleaseHeadless|Any CPU.Build.0 = Debug|Any CPU
+		{B83F88C1-35CB-4A41-A1B2-3EA252300C11}.ReleaseHeadless|Any CPU.ActiveCfg = Release|Any CPU
+		{B83F88C1-35CB-4A41-A1B2-3EA252300C11}.ReleaseHeadless|Any CPU.Build.0 = Release|Any CPU
 		{B83F88C1-35CB-4A41-A1B2-3EA252300C11}.ReleaseMono|Any CPU.ActiveCfg = Debug|Any CPU

fails:

 │ │ × error Failed to apply patch: /home/conda/staged-recipes-copy/recipes/renode-cli/patches/fix-from-master-Renode_NET.sln.patch
 │ │ × error Stdout: patching file Renode_NET.sln
 │ │ × error Hunk #1 FAILED at 718 (different line endings).
 │ │ × error 1 out of 1 hunk FAILED -- saving rejects to file Renode_NET.sln.rej
 │ │ × error Stderr: 

with orig:

		{B83F88C1-35CB-4A41-A1B2-3EA252300C11}.ReleaseHeadless|Any CPU.ActiveCfg = Debug|Any CPU
		{B83F88C1-35CB-4A41-A1B2-3EA252300C11}.ReleaseHeadless|Any CPU.Build.0 = Debug|Any CPU
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

No branches or pull requests

2 participants