jgit/org.eclipse.jgit at 1993cf8a27835413a498bc15ecb4b5b33e10d042 - jgit

纯java实现的git操作库。

Sasa Zivkov 1993cf8a27 Merging Git notes Merging Git notes branches has several differences from merging "normal" branches. Although Git notes are initially stored as one flat tree the tree may fanout when the number of notes becomes too large for efficient access. In this case the first two hex digits of the note name will be used as a subdirectory name and the rest 38 hex digits as the file name under that directory. Similarly, when number of notes decreases a fanout tree may collapse back into a flat tree. The Git notes merge algorithm must take into account possibly different tree structures in different note branches and must properly match them against each other. Any conflict on a Git note is, by default, resolved by concatenating the two conflicting versions of the note. A delete-edit conflict is, by default, resolved by keeping the edit version. The note merge logic is pluggable and the caller may provide custom note merger that will perform different merging strategy. Additionally, it is possible to have non-note entries inside a notes tree. The merge algorithm must also take this fact into account and will try to merge such non-note entries. However, in case of any merge conflicts the merge operation will fail. Git notes merge algorithm is currently not trying to do content merge of non-note entries. Thanks to Shawn Pearce for patiently answering my questions related to this topic, giving hints and providing code snippets. Change-Id: I3b2335c76c766fd7ea25752e54087f9b19d69c88 Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>		14 years ago
..
.settings	Run formatter on edited lines via save action	14 years ago
META-INF	Qualify post 0.10 builds	14 years ago
findBugs	Revert "[findBugs] Silence DM_STRING_CTOR on PacketLineIn"	14 years ago
resources/org/eclipse/jgit	Merging Git notes	14 years ago
src/org/eclipse/jgit	Merging Git notes	14 years ago
.classpath	Externalize strings from JGit	15 years ago
.fbprefs	Initial JGit contribution to eclipse.org	15 years ago
.gitignore	Finish removing Apache Felix maven-bundle-plugin	15 years ago
.project	Revert "Hide Maven target directories from Eclipse"	14 years ago
about.html	Adding some Eclipse-related legal files to JGit	15 years ago
build.properties	Add "resources/" as a source folder	15 years ago
plugin.properties	Cleaning up provider and feature names	15 years ago
pom.xml	Qualify post 0.10 builds	14 years ago