Package com.intellij.openapi.vcs.merge

Class MergeData

java.lang.Object

com.intellij.openapi.vcs.merge.MergeData

public class MergeData
extends java.lang.Object

MergeData contains information about revisions ORIGINAL - is the content which the file had before conflicting change ("Base" - middle panel) LAST - is the content which came from the server while updating ("Theirs" - right panel) CURRENT - is the content from local changes ("Ours" - left panel) byte[] - raw file content MergeProvider should initialize all three contents, because null value is treated as an error, not as blank content.

Field Summary

Fields

Modifier and Type	Field and Description
byte []	CURRENT
FilePath	CURRENT_FILE_PATH
VcsRevisionNumber	CURRENT_REVISION_NUMBER
byte []	LAST
FilePath	LAST_FILE_PATH
VcsRevisionNumber	LAST_REVISION_NUMBER
byte []	ORIGINAL
FilePath	ORIGINAL_FILE_PATH
VcsRevisionNumber	ORIGINAL_REVISION_NUMBER

Constructor Summary

Constructors

Constructor and Description
MergeData()

Method Summary

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Detail

ORIGINAL

public byte [] ORIGINAL

LAST

public byte [] LAST

CURRENT

public byte [] CURRENT

ORIGINAL_REVISION_NUMBER

public VcsRevisionNumber ORIGINAL_REVISION_NUMBER

LAST_REVISION_NUMBER

public VcsRevisionNumber LAST_REVISION_NUMBER

CURRENT_REVISION_NUMBER

public VcsRevisionNumber CURRENT_REVISION_NUMBER

ORIGINAL_FILE_PATH

public FilePath ORIGINAL_FILE_PATH

LAST_FILE_PATH

public FilePath LAST_FILE_PATH

CURRENT_FILE_PATH

public FilePath CURRENT_FILE_PATH

Constructor Detail

MergeData

public MergeData()