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 Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 15 Apr 2010 18:08:48 +0200
branchstable
changeset 10921 fb89cd21a7a0
parent 9110 561ff8d9e4f0
permissions -rw-r--r--
workingctx: correctly compute the flag for noexec filesystems+merge This bug happens if the filesystem doesn't support exec-bit, during merges, for example in 24ed7a541f23 on the hg repo. If f is not in p1, but is in p2 and has the x-bit in p2, since the dirstate is based on p1, and the FS doesn't support the exec-bit, the dirstate can't "guess" the right bit. We instead fix it in workingcontext.flags()/manifest.
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








9110






561ff8d9e4f0
mq: qpop now tells which patches are popped



Mads Kiilerich <mads@kiilerich.com>


parents: 
7627

diff
changeset




     8


popping p1








7627






fb32ae9c76e7
mq: lowercase output



Martin Geisler <mg@daimi.au.dk>


parents: 
6160

diff
changeset




     9


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




    10


tip: 1













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    11


3f910abad313ff802d3a23a7529433872df9b3ae 1













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    12


3f910abad313ff802d3a23a7529433872df9b3ae bar













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    13


9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    14














fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    15


# add some mq patches













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    16


applying p1








7627






fb32ae9c76e7
mq: lowercase output



Martin Geisler <mg@daimi.au.dk>


parents: 
6160

diff
changeset




    17


now at: p1








3492






fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    18


tip: 2













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    19


3f910abad313ff802d3a23a7529433872df9b3ae 1













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    20


3f910abad313ff802d3a23a7529433872df9b3ae bar













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    21


9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    22


tip: 3













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    23


3f910abad313ff802d3a23a7529433872df9b3ae 1













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    24


3f910abad313ff802d3a23a7529433872df9b3ae bar













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    25


9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    26


branch foo: 3













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    27


branch bar: 2













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    28














fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    29


# removing the cache













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    30


tip: 3













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    31


3f910abad313ff802d3a23a7529433872df9b3ae 1













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    32


3f910abad313ff802d3a23a7529433872df9b3ae bar













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    33


9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    34


branch foo: 3













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    35


branch bar: 2













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    36














fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    37


# 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




    38


tip: 3













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    39


3f910abad313ff802d3a23a7529433872df9b3ae 1













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    40


3f910abad313ff802d3a23a7529433872df9b3ae bar













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    41


9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    42


branch foo: 3













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    43


branch bar: 2













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    44


qbase: 1













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    45














fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    46


# detect an invalid cache








9110






561ff8d9e4f0
mq: qpop now tells which patches are popped



Mads Kiilerich <mads@kiilerich.com>


parents: 
7627

diff
changeset




    47


popping p2













561ff8d9e4f0
mq: qpop now tells which patches are popped



Mads Kiilerich <mads@kiilerich.com>


parents: 
7627

diff
changeset




    48


popping p1













561ff8d9e4f0
mq: qpop now tells which patches are popped



Mads Kiilerich <mads@kiilerich.com>


parents: 
7627

diff
changeset




    49


popping p0








7627






fb32ae9c76e7
mq: lowercase output



Martin Geisler <mg@daimi.au.dk>


parents: 
6160

diff
changeset




    50


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




    51


applying p0













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    52


applying p1













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    53


applying p2








7627






fb32ae9c76e7
mq: lowercase output



Martin Geisler <mg@daimi.au.dk>


parents: 
6160

diff
changeset




    54


now at: p2








3492






fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    55


tip: 3













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    56


9539f35bdc80732cc9a3f84e46508f1ed1ec8cff 0













fbf8320f25c8
make mq play nicely with the branch cache



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


parents: 

diff
changeset




    57


9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo















hg-stable