Tobias Warneke
dc5ecb8ded
fixes #159
2022-11-20 12:04:13 +01:00
Goooler
4cad0ea2b9
Optimize CI a bit ( #155 )
2022-09-10 22:29:30 +02:00
Tobias
5aed9f2d9a
Update README.md
2022-09-10 22:03:10 +02:00
Tobias
2224a15ecf
Update README.md
2022-09-10 22:01:24 +02:00
andre161292
7d0fd54f66
Added ability to apply patch to existing list inplace ( #152 )
...
* Added ability to apply patch to existing list inplace
* Corrected typo 'verifyAntApplyTo'
* Added restoreToExisting method as opposite to applyToExisting
Co-authored-by: André Dörscheln <ad@itesign.de >
2022-09-01 23:08:39 +02:00
Tobias Warneke
15934d5b75
Merge origin/master
2022-09-01 22:27:27 +02:00
Tobias Warneke
5aac378e9f
2022-09-01 22:27:09 +02:00
Michael Lesniak
912be299da
Update README.md ( #153 )
...
Update minor version in example.
2022-08-16 18:52:41 +02:00
Tobias Warneke
a1f170eaa0
[maven-release-plugin] prepare for next development iteration
2022-07-23 01:33:41 +02:00
Tobias Warneke
0fd3bd8e06
[maven-release-plugin] prepare release java-diff-utils-parent-4.12
2022-07-23 01:33:40 +02:00
Tobias Warneke
eeb819cad4
Merge origin/master
2022-07-23 01:29:58 +02:00
Tobias Warneke
e73742c4fc
2022-07-23 01:29:37 +02:00
Tobias Warneke
0545519fc3
included some more tests
2022-05-15 00:17:49 +02:00
Okue
bc65f9703c
Update version in gradle example of README ( #145 )
2022-04-10 00:25:45 +02:00
Hussein Kasem
ea9942da12
Fix for #141 ( #144 )
...
* Add test to reproduce issue #141
* Fix assumption on test to match expected behaviour expressed on #141
* Make "/" after "virtual" directories mandatory
Now the regex only matches with "a/", "b/", "new/" and "old/", previously the slash was taken as optional.
fixes #141
2022-04-10 00:20:37 +02:00
Sebastian
8fdd239961
Fix a typo in ComputeDifference.java ( #140 )
2022-02-21 09:00:27 +01:00
anatawa12
37f9eafaa9
Fizzy apply ( #125 )
...
* add applyFuzzyTo and restoreFuzzy
* implement applyFuzzyTo and restoreFuzzy for EqualDelta
* add verifyChunk with fuzzy and delta
* implement fuzzy apply and add tests
* fix style
* extract method
* fix: assign lastPatchDelta and lastPatchEnd
* fix use explict import
* document EqualDelta#applyFuzzyToAt
* set access modifiers
* change test method name
* document empty method
* apply from first
* add more tests
* add more documentation about fuzz parameter
* fix documentation about fizzy patch
Co-authored-by: cowwoc <cowwoc2020@gmail.com >
Co-authored-by: cowwoc <cowwoc2020@gmail.com >
2021-11-28 23:10:52 +01:00
Tobias Warneke
0fd38db8ae
fixes #129 - added the possibility to skip delta decompression
2021-10-21 23:17:04 +02:00
Tobias Warneke
3663cb5d87
changed gpg plugin version
2021-09-08 12:37:20 +02:00
Tobias Warneke
8ae1f6cbbf
[maven-release-plugin] prepare for next development iteration
2021-09-08 12:28:14 +02:00
Tobias Warneke
ab1e38c57b
[maven-release-plugin] prepare release java-diff-utils-parent-4.11
2021-09-08 12:28:13 +02:00
Tobias Warneke
286e807232
Merge origin/master
2021-09-08 12:25:34 +02:00
Jerry James
c85296b63d
Javadoc warning fixes ( #109 )
...
Co-authored-by: Tobias <t.warneke@gmx.net >
2021-09-08 12:21:50 +02:00
Tobias Warneke
4c457b39dc
2021-09-08 12:19:53 +02:00
Tobias Warneke
7dea4e2298
2021-09-08 12:16:50 +02:00
Tobias Warneke
2b02951e89
Merge introduce-optimized-meyers-algorithm
2021-09-08 12:11:12 +02:00
Tobias Warneke
894b8ba300
implemented multi algorithm patch test
2021-08-15 00:52:08 +02:00
Tobias Warneke
2294c5be7b
implemented multi algorithm patch test
2021-08-15 00:51:24 +02:00
Tobias Warneke
7203d4890f
mmoved header to inner processing to allow a header for each diff block
2021-07-19 00:15:39 +02:00
Tobias Warneke
e413d79ecd
attached logging to new meyer diff algorithm
2021-07-18 01:30:44 +02:00
Tobias Warneke
c765616957
attached logging to new meyer diff algorithm
2021-07-18 01:20:25 +02:00
Tobias Warneke
24c3df1f39
2021-07-09 18:27:52 +02:00
Tobias Warneke
9765052226
first implementation of meyers diff with linear space
2021-07-08 22:42:53 +02:00
Tobias Warneke
8bb4a9a8b1
first implementation of meyers diff with linear space
2021-07-08 21:01:10 +02:00
Ilari Suhonen
89ce301123
Fix typo in UnifiedDiff#spplyPatchTo(Predicate<String>, List<String>) ( #127 )
...
* Fix typo in UnifiedDiff.java
Changes UnifiedDiff#spplyPatchTo to UnifiedDiff#applyPatchTo
* Fix typo in test
Fixes the method invocation in the UnifiedDiff roundtrip test to account for the typo fix in UnifiedDiff
2021-07-07 07:15:55 +02:00
Tobias Warneke
3d5343c283
fixes #107 refinement
2021-05-05 22:14:56 +02:00
Tobias Warneke
d384ab6178
2021-04-28 23:33:53 +02:00
Tobias Warneke
f03df6cf38
[maven-release-plugin] prepare for next development iteration
2021-04-28 23:21:52 +02:00
Tobias Warneke
5a11752126
[maven-release-plugin] prepare release java-diff-utils-parent-4.10
2021-04-28 23:21:51 +02:00
Tobias Warneke
94674a0ad7
fixes #119
2021-04-28 22:00:20 +02:00
Tobias Warneke
91a42b2793
fixes #120
2021-04-28 21:14:32 +02:00
Tobias Warneke
bf4ec94cc9
fixes #117
2021-03-14 23:42:10 +01:00
Tobias Warneke
df27b689f3
Merge origin/master into introduce-conflict-patching
2021-03-14 22:45:22 +01:00
Tobias Warneke
2a1239b3a2
fixes #117
2021-03-14 22:44:20 +01:00
Tobias Warneke
8d38e1012e
first test with conflict output
2021-02-27 01:32:45 +01:00
Tobias Warneke
8880ec545b
introduced conflict processing
2021-02-21 23:04:17 +01:00
Tobias Warneke
ce05cbf9c9
2021-02-10 07:34:55 +01:00
Tobias Warneke
f71275de08
upgraded some versions
2021-02-07 13:22:52 +01:00
Tobias Warneke
307574225a
remove verification from applyTo
2021-02-07 13:22:34 +01:00
Tobias Warneke
b9fea86e43
remove verification from applyTo
2021-02-07 13:22:20 +01:00
