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.

Sign up for GitHub

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

Augment the apply test to consider new line removal #58

Closed
wants to merge 1 commit into from
+12 −5
Closed

Augment the apply test to consider new line removal #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gitdiff/testdata/apply/file_text_modify.out
View file
Original file line number Diff line number Diff line change
@@ -192,4 +192,4 @@ this is line 196
this is line 197
this is line 198
this is line 199
this is line 200
this is line 200
15 changes: 11 additions & 4 deletions gitdiff/testdata/apply/file_text_modify.patch
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ diff --git a/gitdiff/testdata/apply/file_text.src b/gitdiff/testdata/apply/file_
this is line 2
this is line 3
this is line 4
@@ -17,10 +17,10 @@ this is line 16
@@ -17,10 +17,10 @@
this is line 17
this is line 18
this is line 19
@@ -20,7 +20,7 @@ diff --git a/gitdiff/testdata/apply/file_text.src b/gitdiff/testdata/apply/file_
this is line 24
this is line 25
this is line 26
@@ -53,10 +53,10 @@ this is line 52
@@ -53,10 +53,10 @@
this is line 53
this is line 54
this is line 55
@@ -35,7 +35,7 @@ diff --git a/gitdiff/testdata/apply/file_text.src b/gitdiff/testdata/apply/file_
this is line 60
this is line 61
this is line 62
@@ -130,8 +130,8 @@ this is line 129
@@ -130,8 +130,8 @@
this is line 130
this is line 131
this is line 132
@@ -46,7 +46,7 @@ diff --git a/gitdiff/testdata/apply/file_text.src b/gitdiff/testdata/apply/file_
this is line 135
this is line 136
this is line 137
@@ -161,12 +161,7 @@ this is line 160
@@ -161,12 +161,7 @@
this is line 161
this is line 162
this is line 163
@@ -60,3 +60,10 @@ diff --git a/gitdiff/testdata/apply/file_text.src b/gitdiff/testdata/apply/file_
this is line 170
this is line 171
this is line 172
@@ -197,4 +192,4 @@
this is line 197
this is line 198
this is line 199
-this is line 200
+this is line 200
\ No newline at end of file