Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-mq-qpush-fail.out
author Martin Geisler <mg@lazybytes.net>
Fri, 16 Oct 2009 00:45:18 +0200
changeset 9599 f3404b7f37ca
parent 9110 561ff8d9e4f0
parent 9590 07a62819b309
permissions -rw-r--r--
Merge with crew-stable
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4658
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     1
 
adding foo
8795
51c29aec0b75 mq: eliminate warning on qpush with empty series
Adrian Buehlmann <adrian@cadifra.com>
parents: 7627
diff changeset 
     2
 
% test qpush on empty series
51c29aec0b75 mq: eliminate warning on qpush with empty series
Adrian Buehlmann <adrian@cadifra.com>
parents: 7627
diff changeset 
     3
 
no patches in series
9110
561ff8d9e4f0 mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents: 8875
diff changeset 
     4
 
popping bad-patch
561ff8d9e4f0 mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents: 8875
diff changeset 
     5
 
popping patch2
561ff8d9e4f0 mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents: 8875
diff changeset 
     6
 
popping patch1
7627
fb32ae9c76e7 mq: lowercase output
Martin Geisler <mg@daimi.au.dk>
parents: 5764
diff changeset 
     7
 
patch queue now empty
4658
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     8
 
applying patch1
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     9
 
applying patch2
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    10
 
applying bad-patch
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    11
 
transaction abort!
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    12
 
rollback completed
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    13
 
cleaning up working directory...done
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    14
 
abort: decoding near '�': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)!
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    15
 
changeset:   0:bbd179dfa0a7
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    16
 
tag:         tip
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    17
 
user:        test
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    18
 
date:        Thu Jan 01 00:00:00 1970 +0000
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    19
 
summary:     add foo
17f5d2069551 mq: test that qpush cleans things up when it fails
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    20
 












17f5d2069551
mq: test that qpush cleans things up when it fails



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    21


% bar should be gone; other unknown/ignored files should still be around












17f5d2069551
mq: test that qpush cleans things up when it fails



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    22


? untracked-file












17f5d2069551
mq: test that qpush cleans things up when it fails



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    23


I .hgignore







5764






8a5d8fb59ed2
Backed out changeset c2a21fe60994



Matt Mackall <mpm@selenic.com>


parents: 
5762

diff
changeset




    24


C foo







8875






801cacf46e62
mq: fix error message for qpush inexistent-patch (issue1702)



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8795

diff
changeset




    25


% preparing qpush of a missing patch












801cacf46e62
mq: fix error message for qpush inexistent-patch (issue1702)



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8795

diff
changeset




    26


no patches applied












801cacf46e62
mq: fix error message for qpush inexistent-patch (issue1702)



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8795

diff
changeset




    27


applying patch1












801cacf46e62
mq: fix error message for qpush inexistent-patch (issue1702)



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8795

diff
changeset




    28


now at: patch1












801cacf46e62
mq: fix error message for qpush inexistent-patch (issue1702)



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8795

diff
changeset




    29


% now we expect the push to fail, but it should NOT complain about patch1












801cacf46e62
mq: fix error message for qpush inexistent-patch (issue1702)



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8795

diff
changeset




    30


applying patch2












801cacf46e62
mq: fix error message for qpush inexistent-patch (issue1702)



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8795

diff
changeset




    31


unable to read patch2












801cacf46e62
mq: fix error message for qpush inexistent-patch (issue1702)



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
8795

diff
changeset




    32


now at: patch1







9590






07a62819b309
mq: fix traceback for qpush inexistant-patch with no patch applied



Benoit Allard <benoit@aeteurope.nl>


parents: 
8875

diff
changeset




    33


% preparing qpush of missing patch with no patch applied







9599






f3404b7f37ca
Merge with crew-stable



Martin Geisler <mg@lazybytes.net>


parents: 
9110
9590

diff
changeset




    34


popping patch1







9590






07a62819b309
mq: fix traceback for qpush inexistant-patch with no patch applied



Benoit Allard <benoit@aeteurope.nl>


parents: 
8875

diff
changeset




    35


patch queue now empty












07a62819b309
mq: fix traceback for qpush inexistant-patch with no patch applied



Benoit Allard <benoit@aeteurope.nl>


parents: 
8875

diff
changeset




    36


% qpush should fail the same way as below












07a62819b309
mq: fix traceback for qpush inexistant-patch with no patch applied



Benoit Allard <benoit@aeteurope.nl>


parents: 
8875

diff
changeset




    37


applying patch1












07a62819b309
mq: fix traceback for qpush inexistant-patch with no patch applied



Benoit Allard <benoit@aeteurope.nl>


parents: 
8875

diff
changeset




    38


unable to read patch1














mercurial