# HG changeset patch # User Artem Tikhomirov # Date 1303955723 -7200 # Node ID 6a24818664913afe9bedcf9549bebb04f1bc048d # Parent 9ce3b26798c4320b8585988437ff798773f8cd0a Wrong parent assignment when building branch chain diff -r 9ce3b26798c4 -r 6a2481866491 src/org/tmatesoft/hg/internal/RepositoryComparator.java --- a/src/org/tmatesoft/hg/internal/RepositoryComparator.java Thu Apr 28 03:44:45 2011 +0200 +++ b/src/org/tmatesoft/hg/internal/RepositoryComparator.java Thu Apr 28 03:55:23 2011 +0200 @@ -260,7 +260,7 @@ if (bc == null) { head2chain.put(rb.p1, bc = new BranchChain(rb.p1)); } - chainElement.p2 = bc; + chainElement.p1 = bc; } if (hasP2 && !localRepo.knownNode(rb.p2)) { toQuery.add(rb.p2); @@ -373,9 +373,13 @@ private void internalDump(String prefix) { if (p1 != null) { System.out.println(prefix + p1.toString()); + } else if (p2 != null) { + System.out.println(prefix + "NONE?!"); } if (p2 != null) { System.out.println(prefix + p2.toString()); + } else if (p1 != null) { + System.out.println(prefix + "NONE?!"); } prefix += " "; if (p1 != null) { diff -r 9ce3b26798c4 -r 6a2481866491 src/org/tmatesoft/hg/repo/HgRemoteRepository.java --- a/src/org/tmatesoft/hg/repo/HgRemoteRepository.java Thu Apr 28 03:44:45 2011 +0200 +++ b/src/org/tmatesoft/hg/repo/HgRemoteRepository.java Thu Apr 28 03:55:23 2011 +0200 @@ -343,7 +343,7 @@ } File tf = writeBundle(c.getInputStream(), false, "HG10GZ" /*didn't see any other that zip*/); if (debug) { - System.out.printf("Wrote bundle %s for roots %s", tf, sb); + System.out.printf("Wrote bundle %s for roots %s\n", tf, sb); } return getLookupHelper().loadBundle(tf); } catch (MalformedURLException ex) {