I never got a received reply... on this. -- robin torsdag 23 oktober 2008 23:14:29 skrev Robin Rosenberg: > Hi, Shawn > > Shouldn't testTrivialTwoWay_disjointhistories() work? > > The two trees have nothing in common and so should be trivially mergeable. > > -- robin > > From cef2695431e368da616a1e9c8de3e5e419854a4c Mon Sep 17 00:00:00 2001 > From: Robin Rosenberg <robin.rosenberg@xxxxxxxxxx> > Date: Thu, 23 Oct 2008 23:09:10 +0200 > Subject: [EGIT PATCH] Simple merge test > > --- > .../org/spearce/jgit/merge/SimpleMergeTest.java | 28 ++++++++++++++++++++ > 1 files changed, 28 insertions(+), 0 deletions(-) > create mode 100644 org.spearce.jgit.test/tst/org/spearce/jgit/merge/SimpleMergeTest.java > > diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/merge/SimpleMergeTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/merge/SimpleMergeTest.java > new file mode 100644 > index 0000000..8ec1c7f > --- /dev/null > +++ b/org.spearce.jgit.test/tst/org/spearce/jgit/merge/SimpleMergeTest.java > @@ -0,0 +1,28 @@ > +package org.spearce.jgit.merge; > + > +import java.io.IOException; > + > +import org.spearce.jgit.lib.ObjectId; > +import org.spearce.jgit.lib.RepositoryTestCase; > + > +public class SimpleMergeTest extends RepositoryTestCase { > + > + public void testTrivialTwoWay_noway() throws IOException { > + Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db); > + boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("a"), db.resolve("c") }); > + assertFalse(merge); > + } > + > + public void testTrivialTwoWay_disjointhistories() throws IOException { > + Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db); > + boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("a"), db.resolve("c~4") }); > + assertTrue(merge); > + } > + > + public void testTrivialTwoWay_ok() throws IOException { > + Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db); > + boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("a^0^0^0"), db.resolve("a^0^0^1") }); > + assertTrue(merge); > + assertEquals(db.mapTree("a^0^0").getId(), ourMerger.getResultTreeId()); > + } > +} -- 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