Mercurial > hg4j
comparison src/org/tmatesoft/hg/core/Cset.java @ 125:26ad21b250e4
Explicit op to tell merge revisions
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Tue, 15 Feb 2011 06:40:36 +0100 |
| parents | cea84c5995e6 |
| children |
comparison
equal
deleted
inserted
replaced
| 124:cea84c5995e6 | 125:26ad21b250e4 |
|---|---|
| 115 initFileChanges(); | 115 initFileChanges(); |
| 116 } | 116 } |
| 117 return deletedFiles; | 117 return deletedFiles; |
| 118 } | 118 } |
| 119 | 119 |
| 120 // XXX do I need boolean isMergeRevision()? | 120 public boolean isMerge() { |
| 121 return !Nodeid.NULL.equals(getSecondParentRevision()); | |
| 122 } | |
| 121 | 123 |
| 122 public Nodeid getFirstParentRevision() { | 124 public Nodeid getFirstParentRevision() { |
| 123 // XXX may read once for both p1 and p2 | 125 // XXX may read once for both p1 and p2 |
| 124 // or use ParentWalker to minimize reads even more. | 126 // or use ParentWalker to minimize reads even more. |
| 125 byte[] p1 = new byte[20]; | 127 byte[] p1 = new byte[20]; |
