mirrors/jgit - jgit - source @ dussan.org

Historia

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 lat temu
..
errors	GPG signature verification via BouncyCastle	3 lat temu
AddCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
AddNoteCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
ApplyCommand.java	ApplyCommand: use context lines to determine hunk location	4 lat temu
ApplyResult.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
ArchiveCommand.java	Use Map interface instead of ConcurrentHashMap class	3 lat temu
BlameCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
CheckoutCommand.java	Allow to resolve a conflict by checking out a file	3 lat temu
CheckoutResult.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
CherryPickCommand.java	Implement ours/theirs content conflict resolution	3 lat temu
CherryPickResult.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
CleanCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
CloneCommand.java	Fail clone if initial branch doesn't exist in remote repository	3 lat temu
CommitCommand.java	Refactor CommitCommand to improve readability	3 lat temu
CreateBranchCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
DeleteBranchCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
DeleteTagCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
DescribeCommand.java	Implement git describe --all	3 lat temu
DiffCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
FetchCommand.java	Fail clone if initial branch doesn't exist in remote repository	3 lat temu
GarbageCollectCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
Git.java	GPG signature verification via BouncyCastle	3 lat temu
GitCommand.java	Fix javadoc in org.eclipse.jgit annotations and api packages	6 lat temu
InitCommand.java	init: add config option to set default for the initial branch name	3 lat temu
ListBranchCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
ListNotesCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
ListTagCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
LogCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
LsRemoteCommand.java	Client-side protocol V2 support for fetching	3 lat temu
MergeCommand.java	Implement ours/theirs content conflict resolution	3 lat temu
MergeResult.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
NameRevCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
PullCommand.java	Implement ours/theirs content conflict resolution	3 lat temu
PullResult.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
PushCommand.java	ErrorProne: Enable and fix UnusedException check	4 lat temu
RebaseCommand.java	Implement ours/theirs content conflict resolution	3 lat temu
RebaseResult.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
ReflogCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
RemoteAddCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
RemoteListCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
RemoteRemoveCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
RemoteSetUrlCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
RemoveNoteCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
RenameBranchCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
ResetCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
RevertCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
RmCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
ShowNoteCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
StashApplyCommand.java	Implement ours/theirs content conflict resolution	3 lat temu
StashCreateCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
StashDropCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
StashListCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
Status.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
StatusCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
SubmoduleAddCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
SubmoduleDeinitCommand.java	Ensure .gitmodules is loaded when accessing submodule name	3 lat temu
SubmoduleDeinitResult.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
SubmoduleInitCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
SubmoduleStatusCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
SubmoduleSyncCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
SubmoduleUpdateCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
TagCommand.java	GPG: support git config gpg.program	3 lat temu
TransportCommand.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
TransportConfigCallback.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
VerificationResult.java	GPG signature verification via BouncyCastle	3 lat temu
VerifySignatureCommand.java	GPG signature verification via BouncyCastle	3 lat temu
package-info.java	Add Javadoc description for packages	11 lat temu