Mercurial > jhg
diff src/org/tmatesoft/hg/repo/HgRemoteRepository.java @ 274:9fb50c04f03c
Use Nodeid.isNull check instead of NULL.equals
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Thu, 25 Aug 2011 03:57:39 +0200 |
| parents | 41a778e3fd31 |
| children | 981f9f50bb6c |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/repo/HgRemoteRepository.java Thu Aug 25 03:56:27 2011 +0200 +++ b/src/org/tmatesoft/hg/repo/HgRemoteRepository.java Thu Aug 25 03:57:39 2011 +0200 @@ -442,6 +442,7 @@ return false; } RemoteBranch o = (RemoteBranch) obj; + // in fact, p1 and p2 are not supposed to be null, ever (at least for RemoteBranch created from server output) return head.equals(o.head) && root.equals(o.root) && (p1 == null && o.p1 == null || p1.equals(o.p1)) && (p2 == null && o.p2 == null || p2.equals(o.p2)); } }