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