| commit | e24f04656b8478cca4a48c535c82040c86a6f987 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Thu, 1 Feb 2007 23:08:40 +0000 (1 18:08 -0500) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Thu, 1 Feb 2007 23:08:40 +0000 (1 18:08 -0500) | ||
| tree | d56848df6ec6dc1f8d409c570cd5d44baf34611c | treesnapshot (tar.gz zip) |
| parent | a0d11dc891faca9b45e3cc598044cf1eccc3d571 | commitdiff |
Don't aggressively merge subtrees.
There is no reason to merge a subtree recursively just because it is
dirty. The user of a MergedTree instance may never bother to go into
a subtree and examine its contents, even if it is different.
I'm also renaming computeMerge to matchByName. What we are really
doing is simply matching the TreeEntry objects by name across the
various input trees; we are not performing any sort of traditional
merge action.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
There is no reason to merge a subtree recursively just because it is
dirty. The user of a MergedTree instance may never bother to go into
a subtree and examine its contents, even if it is different.
I'm also renaming computeMerge to matchByName. What we are really
doing is simply matching the TreeEntry objects by name across the
various input trees; we are not performing any sort of traditional
merge action.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| org.spearce.jgit/src/org/spearce/jgit/lib/MergedTree.java | diffblobblamehistory |