mirrors/jgit - jgit - source @ dussan.org

履歴

Thomas Wolf 8210f29fe4 Implement ours/theirs content conflict resolution Git has different conflict resolution strategies: * There is a tree merge strategy "ours" which just ignores any changes from theirs ("-s ours"). JGit also has the mirror strategy "theirs" ignoring any changes from "ours". (This doesn't exist in C git.) Adapt StashApplyCommand and CherrypickCommand to be able to use those tree merge strategies. * For the resolve/recursive tree merge strategies, there are content conflict resolution strategies "ours" and "theirs", which resolve any conflict hunks by taking the "ours" or "theirs" hunk. In C git those correspond to "-Xours" or -Xtheirs". Implement that in MergeAlgorithm, and add API to set and pass through such a strategy for resolving content conflicts. * The "ours/theirs" content conflict resolution strategies also apply for binary files. Handle these cases in ResolveMerger. Note that the content conflict resolution strategies ("-X ours/theirs") do _not_ apply to modify/delete or delete/modify conflicts. Such conflicts are always reported as conflicts by C git. They do apply, however, if one side completely clears a file's content. Bug: 501111 Change-Id: I2c9c170c61c440a2ab9c387991e7a0c3ab960e07 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>		3年前
..
.settings	[spotbugs] Silence CN_IMPLEMENTS_CLONE_BUT_NOT_CLONEABLE in jgit tests	3年前
META-INF	Prepare 5.12.0-SNAPSHOT builds	3年前
exttst/org/eclipse/jgit	Merge branch 'stable-5.6'	4年前
findBugs	[spotbugs] Silence CN_IMPLEMENTS_CLONE_BUT_NOT_CLONEABLE in jgit tests	3年前
src/org/eclipse/jgit	Decouple JSch from JGit Core	4年前
tst/org/eclipse/jgit	Implement ours/theirs content conflict resolution	3年前
tst-rsrc	HTTP: cookie file stores expiration in seconds	3年前
.classpath	Decouple JSch from JGit Core	4年前
.gitignore	Fix test setup for Eclipse Photon and greater	5年前
.project	Remove references to org.eclipse.jgit.java7	7年前
BUILD	Bazel: Remove unused resources variable	3年前
build.properties	Update slf4j to 1.7.30	3年前
org.eclipse.jgit.core--All-Tests (Java 8) (de).launch	Fixed few locale dependent pgm tests	8年前
org.eclipse.jgit.core--All-Tests (Java 8).launch	Fix classpath of test launch configurations	8年前
org.eclipse.jgit.core--All-Tests.launch	Use JUnit4 for tests	13年前
org.eclipse.jgit.test-WalkEncryptionTest-Proxy.launch	Adding AES Walk Encryption support in http://www.jets3t.org/ mode	8年前
org.eclipse.jgit.test-WalkEncryptionTest.launch	Adding AES Walk Encryption support in http://www.jets3t.org/ mode	8年前
plugin.properties	Fix bundle localization of Apache SSH bundle	4年前
pom.xml	Prepare 5.12.0-SNAPSHOT builds	3年前
tests.bzl	Decouple JSch from JGit Core	4年前