Mercurial Mercurial > hg-stable / 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-caches.out
author Patrick Mezard <pmezard@gmail.com>
Mon, 15 Jun 2009 00:03:26 +0200
changeset 8810 ac92775b3b80
parent 7627 fb32ae9c76e7
child 9110 561ff8d9e4f0
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:
3492
fbf8320f25c8 make mq play nicely with the branch cache
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     1
 
# mq patch on an empty repo
fbf8320f25c8 make mq play nicely with the branch cache
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     2
 
tip: 0
6160
3ee3bc5d06c5 tests: hide the name of the branch cache file
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4177
diff changeset 
     3
 
No branch cache
3492
fbf8320f25c8 make mq play nicely with the branch cache
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     4
 
tip: 0
6160
3ee3bc5d06c5 tests: hide the name of the branch cache file
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4177
diff changeset 
     5
 
No branch cache
3492
fbf8320f25c8 make mq play nicely with the branch cache
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     6
 












fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




     7


# some regular revisions








7627






fb32ae9c76e7
mq: lowercase output



Martin Geisler <mg@daimi.au.dk>


parents: 
6160

diff
changeset




     8


patch queue now empty








3492






fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




     9


tip: 1













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    10


3f910abad313ff802d3a23a7529433872df9b3ae 1













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    11


3f910abad313ff802d3a23a7529433872df9b3ae bar













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    12


9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    13














fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    14


# add some mq patches













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    15


applying p1








7627






fb32ae9c76e7
mq: lowercase output



Martin Geisler <mg@daimi.au.dk>


parents: 
6160

diff
changeset




    16


now at: p1








3492






fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    17


tip: 2













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    18


3f910abad313ff802d3a23a7529433872df9b3ae 1













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    19


3f910abad313ff802d3a23a7529433872df9b3ae bar













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    20


9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    21


tip: 3













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    22


3f910abad313ff802d3a23a7529433872df9b3ae 1













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    23


3f910abad313ff802d3a23a7529433872df9b3ae bar













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    24


9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    25


branch foo: 3













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    26


branch bar: 2













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    27














fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    28


# removing the cache













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    29


tip: 3













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    30


3f910abad313ff802d3a23a7529433872df9b3ae 1













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    31


3f910abad313ff802d3a23a7529433872df9b3ae bar













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    32


9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    33


branch foo: 3













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    34


branch bar: 2













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    35














fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    36


# importing rev 1 (the cache now ends in one of the patches)













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    37


tip: 3













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    38


3f910abad313ff802d3a23a7529433872df9b3ae 1













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    39


3f910abad313ff802d3a23a7529433872df9b3ae bar













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    40


9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    41


branch foo: 3













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    42


branch bar: 2













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    43


qbase: 1













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    44














fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    45


# detect an invalid cache








7627






fb32ae9c76e7
mq: lowercase output



Martin Geisler <mg@daimi.au.dk>


parents: 
6160

diff
changeset




    46


patch queue now empty








3492






fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    47


applying p0













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    48


applying p1













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    49


applying p2








7627






fb32ae9c76e7
mq: lowercase output



Martin Geisler <mg@daimi.au.dk>


parents: 
6160

diff
changeset




    50


now at: p2








3492






fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    51


tip: 3













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    52


9539f35bdc80732cc9a3f84e46508f1ed1ec8cff 0













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    53


9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo















hg-stable