mirrors/jgit - jgit - source @ dussan.org

Vēsture

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