Mercurial > hg4j
comparison src/org/tmatesoft/hg/repo/Revlog.java @ 183:9807bf8f3a9c
Do not assume second parent can be set only when first one is set
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Wed, 13 Apr 2011 14:15:13 +0200 |
parents | 2c3e96674e2a |
children | b777502a06f5 |
comparison
equal
deleted
inserted
replaced
182:f26ffe04ced0 | 183:9807bf8f3a9c |
---|---|
228 final Nodeid nid = new Nodeid(nodeid, true); | 228 final Nodeid nid = new Nodeid(nodeid, true); |
229 sequentialRevisionNodeids[ix++] = nid; | 229 sequentialRevisionNodeids[ix++] = nid; |
230 allNodes.add(nid); | 230 allNodes.add(nid); |
231 if (parent1Revision != -1) { | 231 if (parent1Revision != -1) { |
232 firstParent.put(nid, sequentialRevisionNodeids[parent1Revision]); | 232 firstParent.put(nid, sequentialRevisionNodeids[parent1Revision]); |
233 if (parent2Revision != -1) { | 233 } |
234 secondParent.put(nid, sequentialRevisionNodeids[parent2Revision]); | 234 if (parent2Revision != -1) { // revlog of DataAccess.java has p2 set when p1 is -1 |
235 } | 235 secondParent.put(nid, sequentialRevisionNodeids[parent2Revision]); |
236 } | 236 } |
237 } | 237 } |
238 }; | 238 }; |
239 stream.iterate(0, -1, false, insp); | 239 stream.iterate(0, -1, false, insp); |
240 } | 240 } |