Great - thanks so much for this feedback and link. My merge needs are straightforward, so hopefully this will suit the need!
I have pulled the latest jgit updates and downloaded the four .java files that are referenced in your link. I have added these to the directory structure for jgit in the following new folder: org.spearce.jgit/src/org/spearce/jgit/merge/
However, when I try to now make_jgit.sh I am getting a series of errors (pasted below) that appear to stem from not having the same underlying files. Is it possible that I am not getting the most recent jgit release files? Or am I misunderstanding how you expect these Merge files to be used?
Thanks again,
David
<errors>
Entering org.spearce.jgit ...
./org/spearce/jgit/merge/StrategySimpleTwoWayInCore.java:45: cannot find symbol
symbol : class UnmergedPathException
location: package org.spearce.jgit.errors
import org.spearce.jgit.errors.UnmergedPathException;
^
./org/spearce/jgit/merge/Merger.java:184: cannot find symbol
symbol : constructor CanonicalTreeParser(<nulltype>,org.spearce.jgit.lib.Repository,org.spearce.jgit.revwalk.RevTree,org.spearce.jgit.lib.WindowCursor)
location: class org.spearce.jgit.treewalk.CanonicalTreeParser
return new CanonicalTreeParser(null, db, base.getTree(), curs);
^
./org/spearce/jgit/merge/StrategySimpleTwoWayInCore.java:98: cannot find symbol
symbol : method newInCore()
location: class org.spearce.jgit.dircache.DirCache
cache = DirCache.newInCore();
^
./org/spearce/jgit/merge/StrategySimpleTwoWayInCore.java:123: cannot find symbol
symbol : variable STAGE_0
location: class org.spearce.jgit.dircache.DirCacheEntry
add(T_THEIRS, DirCacheEntry.STAGE_0);
^
./org/spearce/jgit/merge/StrategySimpleTwoWayInCore.java:125: cannot find symbol
symbol : variable STAGE_0
location: class org.spearce.jgit.dircache.DirCacheEntry
add(T_OURS, DirCacheEntry.STAGE_0);
^
./org/spearce/jgit/merge/StrategySimpleTwoWayInCore.java:137: cannot find symbol
symbol : method writeTree(org.spearce.jgit.lib.ObjectWriter)
location: class org.spearce.jgit.dircache.DirCache
resultTree = cache.writeTree(getObjectWriter());
^
./org/spearce/jgit/merge/StrategySimpleTwoWayInCore.java:139: cannot find symbol
symbol : class UnmergedPathException
location: class org.spearce.jgit.merge.StrategySimpleTwoWayInCore.InCoreMerger
} catch (UnmergedPathException upe) {
^
./org/spearce/jgit/merge/StrategySimpleTwoWayInCore.java:147: cannot find symbol
symbol : method getRawPath()
location: class org.spearce.jgit.treewalk.NameConflictTreeWalk
builder.addTree(tw.getRawPath(), db, tw.getObjectId(1));
^
./org/spearce/jgit/merge/StrategySimpleTwoWayInCore.java:149: cannot find symbol
symbol : variable STAGE_0
location: class org.spearce.jgit.dircache.DirCacheEntry
add(T_OURS, DirCacheEntry.STAGE_0);
^
./org/spearce/jgit/merge/StrategySimpleTwoWayInCore.java:153: cannot find symbol
symbol : variable STAGE_1
location: class org.spearce.jgit.dircache.DirCacheEntry
add(T_BASE, DirCacheEntry.STAGE_1);
^
./org/spearce/jgit/merge/StrategySimpleTwoWayInCore.java:154: cannot find symbol
symbol : variable STAGE_2
location: class org.spearce.jgit.dircache.DirCacheEntry
add(T_OURS, DirCacheEntry.STAGE_2);
^
./org/spearce/jgit/merge/StrategySimpleTwoWayInCore.java:155: cannot find symbol
symbol : variable STAGE_3
location: class org.spearce.jgit.dircache.DirCacheEntry
add(T_THEIRS, DirCacheEntry.STAGE_3);
^
./org/spearce/jgit/merge/StrategySimpleTwoWayInCore.java:163: cannot find symbol
symbol : method getRawPath()
location: class org.spearce.jgit.treewalk.NameConflictTreeWalk
e = new DirCacheEntry(tw.getRawPath(), stage);
^
./org/spearce/jgit/merge/StrategySimpleTwoWayInCore.java:163: internal error; cannot instantiate org.spearce.jgit.dircache.DirCacheEntry.<init> at org.spearce.jgit.dircache.DirCacheEntry to ()
e = new DirCacheEntry(tw.getRawPath(), stage);
^
</errors
-----Original Message-----
David is probably talking about the 8 patch series I proposed to add a
crude merge API to JGit. The patches are available here, based on the
current JGit master:
http://android.git.kernel.org/?p=tools/egit.git;a=shortlog;h=refs/heads/for-gerrit2
git://android.git.kernel.org/tools/egit.git for-gerrit2
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
