Show More
@@ -265,14 +265,14 b' def _kwfwrite(ui, repo, expand, *pats, *' | |||||
265 | raise util.Abort(_('outstanding uncommitted merge')) |
|
265 | raise util.Abort(_('outstanding uncommitted merge')) | |
266 | kwt = kwtools['templater'] |
|
266 | kwt = kwtools['templater'] | |
267 | status = _status(ui, repo, kwt, *pats, **opts) |
|
267 | status = _status(ui, repo, kwt, *pats, **opts) | |
268 |
modified, added, removed, deleted = status |
|
268 | modified, added, removed, deleted, unknown, ignored, clean = status | |
269 | if modified or added or removed or deleted: |
|
269 | if modified or added or removed or deleted: | |
270 | raise util.Abort(_('outstanding uncommitted changes')) |
|
270 | raise util.Abort(_('outstanding uncommitted changes')) | |
271 | wlock = lock = None |
|
271 | wlock = lock = None | |
272 | try: |
|
272 | try: | |
273 | wlock = repo.wlock() |
|
273 | wlock = repo.wlock() | |
274 | lock = repo.lock() |
|
274 | lock = repo.lock() | |
275 |
kwt.overwrite(None, expand, |
|
275 | kwt.overwrite(None, expand, clean) | |
276 | finally: |
|
276 | finally: | |
277 | release(lock, wlock) |
|
277 | release(lock, wlock) | |
278 |
|
278 |
General Comments 0
You need to be logged in to leave comments.
Login now