Mercurial > hg
diff tests/test-mq-qimport.out @ 7160:1b7b21b634f2
mq: make qimport -f work properly. Closes issue1255.
From Bernhard Leiner.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sat, 18 Oct 2008 17:29:45 -0700 |
parents | d1d011accf94 |
children | 8046f0a070a6 |
line wrap: on
line diff
--- a/tests/test-mq-qimport.out Sat Oct 18 16:53:44 2008 -0700 +++ b/tests/test-mq-qimport.out Sat Oct 18 17:29:45 2008 -0700 @@ -3,6 +3,18 @@ % import URL adding url.diff to series file url.diff +% import patch that already exists +abort: patch "url.diff" already exists +applying url.diff +Now at: url.diff +foo +Patch queue now empty +% qimport -f +adding url.diff to series file +applying url.diff +Now at: url.diff +foo2 +Patch queue now empty % build diff with CRLF adding b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved