Mercurial > hg
changeset 6555:36434ca0e7b0
merge from crew-stable
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Wed, 16 Apr 2008 09:36:24 +0200 |
| parents | 4a064e1977f8 (current diff) 315b36ce6251 (diff) |
| children | f2abfca4beb8 |
| files | hgext/mq.py |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Mon Apr 14 00:36:01 2008 +0200 +++ b/hgext/mq.py Wed Apr 16 09:36:24 2008 +0200 @@ -1902,7 +1902,10 @@ return newpath def push(ui, repo, patch=None, **opts): - """push the next patch onto the stack""" + """push the next patch onto the stack + + When --force is applied, all local changes in patched files will be lost. + """ q = repo.mq mergeq = None