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