Mercurial > hg
view tests/test-eol-patch.out @ 12282:9e457c3f47d9
mq: rename strip --nobackup option to --no-backup (issue2377)
Same option name as for hg revert --no-backup.
Deprecate strip --nobackup.
| author | Christian Ebert <blacktrash@gmx.net> |
|---|---|
| date | Tue, 14 Sep 2010 22:11:53 +0200 |
| parents | 0bb67503ad4b |
| children |
line wrap: on
line source
# ==== setup LF repository ==== % hg init adding .hgeol adding native.txt adding unix.txt adding win.txt % hg clone repo repo-LF 4 files updated, 0 files merged, 0 files removed, 0 files unresolved % printrepr.py native.txt first second third % printrepr.py unix.txt first second third % printrepr.py win.txt first\r second\r third\r % hg diff diff --git a/native.txt b/native.txt --- a/native.txt +++ b/native.txt @@ -1,3 +1,2 @@ first -second third diff --git a/unix.txt b/unix.txt --- a/unix.txt +++ b/unix.txt @@ -1,3 +1,2 @@ first -second third diff --git a/win.txt b/win.txt --- a/win.txt +++ b/win.txt @@ -1,3 +1,2 @@ first\r -second\r third\r % hg revert reverting native.txt reverting unix.txt reverting win.txt % hg import applying p % printrepr.py native.txt first third % printrepr.py unix.txt first third % printrepr.py win.txt first\r third\r % hg diff -c tip diff --git a/native.txt b/native.txt --- a/native.txt +++ b/native.txt @@ -1,3 +1,2 @@ first -second third diff --git a/unix.txt b/unix.txt --- a/unix.txt +++ b/unix.txt @@ -1,3 +1,2 @@ first -second third diff --git a/win.txt b/win.txt --- a/win.txt +++ b/win.txt @@ -1,3 +1,2 @@ first\r -second\r third\r % hg clone repo repo-CRLF 4 files updated, 0 files merged, 0 files removed, 0 files unresolved % printrepr.py native.txt first\r second\r third\r % printrepr.py unix.txt first second third % printrepr.py win.txt first\r second\r third\r % hg diff diff --git a/native.txt b/native.txt --- a/native.txt +++ b/native.txt @@ -1,3 +1,2 @@ first -second third diff --git a/unix.txt b/unix.txt --- a/unix.txt +++ b/unix.txt @@ -1,3 +1,2 @@ first -second third diff --git a/win.txt b/win.txt --- a/win.txt +++ b/win.txt @@ -1,3 +1,2 @@ first\r -second\r third\r % hg revert reverting native.txt reverting unix.txt reverting win.txt % hg import applying p % printrepr.py native.txt first\r third\r % printrepr.py unix.txt first third % printrepr.py win.txt first\r third\r % hg diff -c tip diff --git a/native.txt b/native.txt --- a/native.txt +++ b/native.txt @@ -1,3 +1,2 @@ first -second third diff --git a/unix.txt b/unix.txt --- a/unix.txt +++ b/unix.txt @@ -1,3 +1,2 @@ first -second third diff --git a/win.txt b/win.txt --- a/win.txt +++ b/win.txt @@ -1,3 +1,2 @@ first\r -second\r third\r # ==== setup CRLF repository ==== % hg init adding .hgeol adding native.txt adding unix.txt adding win.txt % hg clone repo repo-LF 4 files updated, 0 files merged, 0 files removed, 0 files unresolved % printrepr.py native.txt first second third % printrepr.py unix.txt first second third % printrepr.py win.txt first\r second\r third\r % hg diff diff --git a/native.txt b/native.txt --- a/native.txt +++ b/native.txt @@ -1,3 +1,2 @@ first\r -second\r third\r diff --git a/unix.txt b/unix.txt --- a/unix.txt +++ b/unix.txt @@ -1,3 +1,2 @@ first -second third diff --git a/win.txt b/win.txt --- a/win.txt +++ b/win.txt @@ -1,3 +1,2 @@ first\r -second\r third\r % hg revert reverting native.txt reverting unix.txt reverting win.txt % hg import applying p % printrepr.py native.txt first third % printrepr.py unix.txt first third % printrepr.py win.txt first\r third\r % hg diff -c tip diff --git a/native.txt b/native.txt --- a/native.txt +++ b/native.txt @@ -1,3 +1,2 @@ first\r -second\r third\r diff --git a/unix.txt b/unix.txt --- a/unix.txt +++ b/unix.txt @@ -1,3 +1,2 @@ first -second third diff --git a/win.txt b/win.txt --- a/win.txt +++ b/win.txt @@ -1,3 +1,2 @@ first\r -second\r third\r % hg clone repo repo-CRLF 4 files updated, 0 files merged, 0 files removed, 0 files unresolved % printrepr.py native.txt first\r second\r third\r % printrepr.py unix.txt first second third % printrepr.py win.txt first\r second\r third\r % hg diff diff --git a/native.txt b/native.txt --- a/native.txt +++ b/native.txt @@ -1,3 +1,2 @@ first\r -second\r third\r diff --git a/unix.txt b/unix.txt --- a/unix.txt +++ b/unix.txt @@ -1,3 +1,2 @@ first -second third diff --git a/win.txt b/win.txt --- a/win.txt +++ b/win.txt @@ -1,3 +1,2 @@ first\r -second\r third\r % hg revert reverting native.txt reverting unix.txt reverting win.txt % hg import applying p % printrepr.py native.txt first\r third\r % printrepr.py unix.txt first third % printrepr.py win.txt first\r third\r % hg diff -c tip diff --git a/native.txt b/native.txt --- a/native.txt +++ b/native.txt @@ -1,3 +1,2 @@ first\r -second\r third\r diff --git a/unix.txt b/unix.txt --- a/unix.txt +++ b/unix.txt @@ -1,3 +1,2 @@ first -second third diff --git a/win.txt b/win.txt --- a/win.txt +++ b/win.txt @@ -1,3 +1,2 @@ first\r -second\r third\r