Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3578:3b4e00cba57a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Define and use nullrev (revision of nullid) instead of -1.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 29 Oct 2006 10:53:51 +0100
parents 798bcde0c9c2
children 41989e55fa37
comparison
equal deleted inserted replaced
3577:7f7425306925 3578:3b4e00cba57a
32 if not fco.cmp(fcm.data()): # files identical? 32 if not fco.cmp(fcm.data()): # files identical?
33 return None 33 return None
34 34
35 fca = fcm.ancestor(fco) 35 fca = fcm.ancestor(fco)
36 if not fca: 36 if not fca:
37 fca = repo.filectx(fw, fileid=-1) 37 fca = repo.filectx(fw, fileid=nullrev)
38 a = repo.wjoin(fw) 38 a = repo.wjoin(fw)
39 b = temp("base", fca) 39 b = temp("base", fca)
40 c = temp("other", fco) 40 c = temp("other", fco)
41 41
42 if fw != fo: 42 if fw != fo: