Mercurial Mercurial > hg / 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>
Sat, 10 Nov 2007 21:30:59 +0100
changeset 5531 a3fe91b4f6eb
parent 4177 a7af0eeae8a3
child 6160 3ee3bc5d06c5
permissions -rw-r--r--
Change standard streams mode to binary at hg startup Standard streams are expected to operate in binary mode everywhere, especially with archive, cat, diff and export commands. Rewriting these to separate informational output from binary content is complicated to do and to maintain, nonwithstanding mode switching reliability. Changing all output mode to binary should not have much impact on Windows were stream processing tools are barely used and usually cope with unix style endings. Streams mode being process wide, the switch is performed in the startup script to avoid polluting existing API users who may have solved this issue already or ignored it at least for the mercurial part.
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
4177
a7af0eeae8a3 Move branches.cache to branch.cache
Matt Mackall <mpm@selenic.com>
parents: 4176
diff changeset 
     3
 
No .hg/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
4177
a7af0eeae8a3 Move branches.cache to branch.cache
Matt Mackall <mpm@selenic.com>
parents: 4176
diff changeset 
     5
 
No .hg/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













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




     8


Patch queue now empty













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













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    16


Now at: p1













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













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    46


Patch queue now empty













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













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    50


Now at: p2













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















Mercurial