Mercurial > jhg
diff src/org/tmatesoft/hg/repo/HgBundle.java @ 663:46b56864b483
Pull: phase2 - update phases from remote, fncache with added files. Tests
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Wed, 10 Jul 2013 16:41:49 +0200 |
| parents | 12a4f60ea972 |
| children | fba85bc1dfb8 |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/HgBundle.java Wed Jul 10 11:53:19 2013 +0200 +++ b/src/org/tmatesoft/hg/repo/HgBundle.java Wed Jul 10 16:41:49 2013 +0200 @@ -413,7 +413,7 @@ private static void readGroup(DataAccess da, Inspector inspector) throws IOException, HgRuntimeException { int len = da.readInt(); boolean good2go = true; - Nodeid prevNodeid = Nodeid.NULL; + Nodeid prevNodeid = null; while (len > 4 && !da.isEmpty() && good2go) { byte[] nb = new byte[80]; da.readBytes(nb, 0, 80); @@ -498,7 +498,7 @@ * @return revision of delta base, never <code>null</code> */ public Nodeid patchBase() { - return deltaBase; + return deltaBase == null ? firstParent() : deltaBase; } public byte[] rawDataByteArray() throws IOException { // XXX IOException or HgInvalidFileException?