Mercurial > hg4j
diff src/org/tmatesoft/hg/repo/HgMergeState.java @ 367:2fadf8695f8a
Use 'revision index' instead of the vague 'local revision number' concept in the API
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Fri, 16 Dec 2011 15:37:27 +0100 |
| parents | a0864b2892cd |
| children | ee8264d80747 |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/HgMergeState.java Fri Dec 16 04:43:18 2011 +0100 +++ b/src/org/tmatesoft/hg/repo/HgMergeState.java Fri Dec 16 15:37:27 2011 +0100 @@ -114,13 +114,13 @@ final ManifestRevision m1 = new ManifestRevision(nodeidPool, fnamePool); final ManifestRevision m2 = new ManifestRevision(nodeidPool, fnamePool); if (!wcp2.isNull()) { - final int rp2 = repo.getChangelog().getLocalRevision(wcp2); + final int rp2 = repo.getChangelog().getRevisionIndex(wcp2); repo.getManifest().walk(rp2, rp2, m2); } BufferedReader br = new BufferedReader(new FileReader(f)); String s = br.readLine(); stateParent = nodeidPool.unify(Nodeid.fromAscii(s)); - final int rp1 = repo.getChangelog().getLocalRevision(stateParent); + final int rp1 = repo.getChangelog().getRevisionIndex(stateParent); repo.getManifest().walk(rp1, rp1, m1); while ((s = br.readLine()) != null) { String[] r = s.split("\\00");