tests/test-rollback.out
author Patrick Mezard <pmezard@gmail.com>
Mon, 15 Jun 2009 00:03:26 +0200
changeset 8810 ac92775b3b80
parent 6058 88b4d726332a
child 9934 720f70b720d3
permissions -rw-r--r--
Add patch.eol to ignore EOLs when patching (issue1019) The intent is to fix many issues involving patching when win32ext is enabled. With win32ext, the working directory and repository files EOLs are not the same which means that patches made on a non-win32ext host do not apply cleanly because of EOLs discrepancies. A theorically correct approach would be transform either the patched file or the patch content with the encoding/decoding filters used by win32ext. This solution is tricky to implement and invasive, instead we prefer to address the win32ext case, by offering a way to ignore input EOLs when patching and rewriting them when saving the patched result.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     1
checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     2
checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     3
crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     4
checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     5
1 files, 1 changesets, 1 total revisions
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 981
diff changeset
     6
changeset:   0:0acdaf898367
388
398737777644 Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 382
diff changeset
     7
tag:         tip
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     8
user:        test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 981
diff changeset
     9
date:        Mon Jan 12 13:46:40 1970 +0000
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    10
summary:     test
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    11
502
509e62469cb1 Update undo test
mpm@selenic.com
parents: 388
diff changeset
    12
rolling back last transaction
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    13
checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    14
checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    15
crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    16
checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    17
0 files, 0 changesets, 0 total revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    18
A a
6058
88b4d726332a Do not abort rollback if undo.branch isn't available, but warn.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5814
diff changeset
    19
% Test issue 902
5814
dd5a501cb97f restore branch after rollback (issue 902)
Alexandre Vassalotti <mercurial-bugs@selenic.com>
parents: 2227
diff changeset
    20
marked working directory as branch test
dd5a501cb97f restore branch after rollback (issue 902)
Alexandre Vassalotti <mercurial-bugs@selenic.com>
parents: 2227
diff changeset
    21
rolling back last transaction
dd5a501cb97f restore branch after rollback (issue 902)
Alexandre Vassalotti <mercurial-bugs@selenic.com>
parents: 2227
diff changeset
    22
default
6058
88b4d726332a Do not abort rollback if undo.branch isn't available, but warn.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5814
diff changeset
    23
% Test rollback of hg before issue 902 was fixed
88b4d726332a Do not abort rollback if undo.branch isn't available, but warn.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5814
diff changeset
    24
marked working directory as branch test
88b4d726332a Do not abort rollback if undo.branch isn't available, but warn.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5814
diff changeset
    25
rolling back last transaction
88b4d726332a Do not abort rollback if undo.branch isn't available, but warn.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5814
diff changeset
    26
Named branch could not be reset, current branch still is: test
88b4d726332a Do not abort rollback if undo.branch isn't available, but warn.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 5814
diff changeset
    27
test