Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/localrepo.py @ 3240:8d4855fd9d7b
merge: use new working context object in update
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 03 Oct 2006 01:21:46 -0500 |
parents | ff15ba23c1cf |
children | a184cd0c2db9 |
line wrap: on
line diff
--- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -321,6 +321,9 @@ class localrepository(repo.repository): def changectx(self, changeid=None): return context.changectx(self, changeid) + def workingctx(self): + return context.workingctx(self) + def parents(self, changeid=None): ''' get list of changectxs for parents of changeid or working directory