diff options
| author | Matthias Sohn | 2019-09-03 11:24:28 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2019-09-03 12:20:37 +0000 |
| commit | b525036e586c1e3e8ec5ab316cef1652603fe78e (patch) | |
| tree | 39f3e9d3c3f665c47ba7c3ea58dd538cedbc409a /org.eclipse.jgit/.settings | |
| parent | 53014c0804e2aef8dce7ad535518b761114be6c7 (diff) | |
| parent | 0e3d4a273f3d5b79c55205a25f21d688b6f131fc (diff) | |
| download | jgit-b525036e586c1e3e8ec5ab316cef1652603fe78e.tar.gz jgit-b525036e586c1e3e8ec5ab316cef1652603fe78e.tar.xz jgit-b525036e586c1e3e8ec5ab316cef1652603fe78e.zip | |
Merge branch 'stable-4.9' into stable-4.10
* stable-4.9:
BatchRefUpdate: repro racy atomic update, and fix it
Delete unused FileTreeIteratorWithTimeControl
Fix RacyGitTests#testRacyGitDetection
Change RacyGitTests to create a racy git situation in a stable way
Silence API warnings
Change-Id: Id5bf44645655fca40ad22bb1f1ad20a7c2e8f6db
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/.settings')
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 46 |
1 files changed, 38 insertions, 8 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 726d670311..6a15442105 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,13 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.jgit" version="2"> - <resource path="META-INF/MANIFEST.MF"> - <filter id="924844039"> - <message_arguments> - <message_argument value="4.10.1"/> - <message_argument value="4.10.0"/> - </message_arguments> - </filter> - </resource> <resource path="src/org/eclipse/jgit/errors/PackInvalidException.java" type="org.eclipse.jgit.errors.PackInvalidException"> <filter id="1142947843"> <message_arguments> @@ -22,6 +14,21 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants"> + <filter id="336658481"> + <message_arguments> + <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/> + <message_argument value="CONFIG_KEY_SUPPORTSATOMICFILECREATION"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="4.5"/> + <message_argument value="4.10"/> + <message_argument value="CONFIG_KEY_SUPPORTSATOMICFILECREATION"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants"> <filter id="1141899266"> <message_arguments> @@ -47,9 +54,32 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger"> + <filter id="1141899266"> + <message_arguments> + <message_argument value="3.5"/> + <message_argument value="4.10"/> + <message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator, boolean)"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS"> <filter id="1141899266"> <message_arguments> + <message_argument value="4.5"/> + <message_argument value="4.10"/> + <message_argument value="createNewFile(File)"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="4.5"/> + <message_argument value="4.10"/> + <message_argument value="supportsAtomicCreateNewFile()"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> <message_argument value="4.7"/> <message_argument value="4.10"/> <message_argument value="createNewFileAtomic(File)"/> |