Skip to content

Merge Edit and Rename#14

Merged
hannesm merged 1 commit intohannesm:mainfrom
kit-ty-kate:merge-edit-rename
Mar 27, 2024
Merged

Merge Edit and Rename#14
hannesm merged 1 commit intohannesm:mainfrom
kit-ty-kate:merge-edit-rename

Conversation

@kit-ty-kate
Copy link
Copy Markdown
Collaborator

I feel like they shouldn't be separated given a diff can be an Edit or a Rename solely based on the prefix number. For example:

--- a/a
+++ b/a

would be Rename ("a/a", "b/a") but if we're applying it using patch -p1 they're equal.

I feel like they shouldn't be separated given a diff can be an
Edit or a Rename solely based on the prefix number. For example:
```
--- a/a
+++ b/a
```
would be Rename ("a/a", "b/a") but if we're applying it using
`patch -p1` they're equal.
@hannesm
Copy link
Copy Markdown
Owner

hannesm commented Mar 27, 2024

thanks.

@hannesm hannesm merged commit 349838c into hannesm:main Mar 27, 2024
hannesm added a commit to hannesm/opam-repository that referenced this pull request Apr 3, 2024
CHANGES:

* Add support for git format-patch headers (hannesm/patch#7 @kit-ty-kate)
* Pretty-printer: fix no_newline support (hannesm/patch#11 @kit-ty-kate)
* Various fixes to the diff parser ('---' mid diff, hunks, no newline at end
  of file) (hannesm/patch#10 @kit-ty-kate)
* Add Patch.pp_list (hannesm/patch#13 @kit-ty-kate)
* Merge Edit and Rename operations (hannesm/patch#14 @kit-ty-kate)
* Add a diff implementation (hannesm/patch#12 @kit-ty-kate)
* Rename to_diffs to parse (hannesm/patch#16 @kit-ty-kate)
* Provide API docs, tweak documentation (@hannesm)
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.

2 participants