Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/merge.py @ 6740:b148e9099133
use repo.changectx(None) to get a workingctx
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 26 Jun 2008 13:46:29 -0500 |
| parents | 4b92591c69a7 |
| children | 1dca460e7d1e |
comparison
equal
deleted
inserted
replaced
| 6739:c9fbd6ec3489 | 6740:b148e9099133 |
|---|---|
| 407 partial = a function to filter file lists (dirstate not updated) | 407 partial = a function to filter file lists (dirstate not updated) |
| 408 """ | 408 """ |
| 409 | 409 |
| 410 wlock = repo.wlock() | 410 wlock = repo.wlock() |
| 411 try: | 411 try: |
| 412 wc = repo.workingctx() | 412 wc = repo.changectx(None) |
| 413 if node is None: | 413 if node is None: |
| 414 # tip of current branch | 414 # tip of current branch |
| 415 try: | 415 try: |
| 416 node = repo.branchtags()[wc.branch()] | 416 node = repo.branchtags()[wc.branch()] |
| 417 except KeyError: | 417 except KeyError: |