Merge changes Ia6c3935c,I46a29eae
* changes: Remove unused import introduced ina551b64
Silence API errors caused by adding enum constants indbb137e
This commit is contained in:
commit
9e54cbb693
|
@ -44,7 +44,6 @@
|
||||||
package org.eclipse.jgit.util;
|
package org.eclipse.jgit.util;
|
||||||
|
|
||||||
import static org.junit.Assert.assertArrayEquals;
|
import static org.junit.Assert.assertArrayEquals;
|
||||||
import static org.junit.Assert.assertEquals;
|
|
||||||
import static org.junit.Assert.assertNotNull;
|
import static org.junit.Assert.assertNotNull;
|
||||||
|
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
|
|
|
@ -16,6 +16,26 @@
|
||||||
</message_arguments>
|
</message_arguments>
|
||||||
</filter>
|
</filter>
|
||||||
</resource>
|
</resource>
|
||||||
|
<resource path="src/org/eclipse/jgit/lib/ReflogEntry.java" type="org.eclipse.jgit.lib.ReflogEntry">
|
||||||
|
<filter comment="adding enum constant does not break binary compatibility" id="403767336">
|
||||||
|
<message_arguments>
|
||||||
|
<message_argument value="org.eclipse.jgit.lib.ReflogEntry"/>
|
||||||
|
<message_argument value="PREFIX_CREATED"/>
|
||||||
|
</message_arguments>
|
||||||
|
</filter>
|
||||||
|
<filter comment="adding enum constant does not break binary compatibility" id="403767336">
|
||||||
|
<message_arguments>
|
||||||
|
<message_argument value="org.eclipse.jgit.lib.ReflogEntry"/>
|
||||||
|
<message_argument value="PREFIX_FAST_FORWARD"/>
|
||||||
|
</message_arguments>
|
||||||
|
</filter>
|
||||||
|
<filter comment="adding enum constant does not break binary compatibility" id="403767336">
|
||||||
|
<message_arguments>
|
||||||
|
<message_argument value="org.eclipse.jgit.lib.ReflogEntry"/>
|
||||||
|
<message_argument value="PREFIX_FORCED_UPDATE"/>
|
||||||
|
</message_arguments>
|
||||||
|
</filter>
|
||||||
|
</resource>
|
||||||
<resource path="src/org/eclipse/jgit/merge/MergeStrategy.java" type="org.eclipse.jgit.merge.MergeStrategy">
|
<resource path="src/org/eclipse/jgit/merge/MergeStrategy.java" type="org.eclipse.jgit.merge.MergeStrategy">
|
||||||
<filter comment="OSGi semantic versioning allows breaking implementors of an API in a minor version" id="336695337">
|
<filter comment="OSGi semantic versioning allows breaking implementors of an API in a minor version" id="336695337">
|
||||||
<message_arguments>
|
<message_arguments>
|
||||||
|
|
Loading…
Reference in New Issue