Mercurial > hg
view tests/test-eol-update.out @ 11462:1b82a26635d7 stable
mq: qimport cleanup on fail (issue2214)
save state of successfully added patches and ensure
cleanup on the way out.
| author | Vishakh H <vsh426@gmail.com> |
|---|---|
| date | Tue, 29 Jun 2010 03:09:42 +0530 |
| parents | 0bb67503ad4b |
| children | ed639917c825 |
line wrap: on
line source
# ==== setup repository ==== % hg init adding .hgeol adding a.txt % hg clone repo repo-LF 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % printrepr.py a.txt (before) first\r second\r third\r % printrepr.py a.txt (after) first third % hg diff diff --git a/a.txt b/a.txt --- a/a.txt +++ b/a.txt @@ -1,3 +1,2 @@ first\r -second\r third\r % hg update 0 merging a.txt 1 files updated, 1 files merged, 0 files removed, 0 files unresolved % printrepr.py a.txt first\r third\r % hg diff diff --git a/a.txt b/a.txt --- a/a.txt +++ b/a.txt @@ -1,3 +1,2 @@ first -second third % hg clone repo repo-CRLF 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % printrepr.py a.txt (before) first\r second\r third\r % printrepr.py a.txt (after) first\r third\r % hg diff diff --git a/a.txt b/a.txt --- a/a.txt +++ b/a.txt @@ -1,3 +1,2 @@ first\r -second\r third\r % hg update 0 merging a.txt 1 files updated, 1 files merged, 0 files removed, 0 files unresolved % printrepr.py a.txt first\r third\r % hg diff diff --git a/a.txt b/a.txt --- a/a.txt +++ b/a.txt @@ -1,3 +1,2 @@ first -second third