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-qgoto.out
author timeless <timeless@gmail.com>
Fri, 30 Jul 2010 10:32:24 +0300
branchstable
changeset 11716 db426935fa94
parent 9110 561ff8d9e4f0
permissions -rw-r--r--
progress: use gerund (updating) for merge progress
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4432
905397be7688 mq: add qgoto command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     1
 
adding a
9110
561ff8d9e4f0 mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents: 7627
diff changeset 
     2
 
popping c.patch
561ff8d9e4f0 mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents: 7627
diff changeset 
     3
 
popping b.patch
7627
fb32ae9c76e7 mq: lowercase output
Martin Geisler <mg@daimi.au.dk>
parents: 7568
diff changeset 
     4
 
now at: a.patch
4432
905397be7688 mq: add qgoto command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     5
 
applying b.patch
905397be7688 mq: add qgoto command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     6
 
applying c.patch
7627
fb32ae9c76e7 mq: lowercase output
Martin Geisler <mg@daimi.au.dk>
parents: 7568
diff changeset 
     7
 
now at: c.patch
9110
561ff8d9e4f0 mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents: 7627
diff changeset 
     8
 
popping c.patch
7627
fb32ae9c76e7 mq: lowercase output
Martin Geisler <mg@daimi.au.dk>
parents: 7568
diff changeset 
     9
 
now at: b.patch
7568
12df451ce205 mq: don't warn about ambiguous patch name when using patch index (issue1439)
Jason Orendorff <jorendorff@mozilla.com>
parents: 4432
diff changeset 
    10
 












12df451ce205
mq: don't warn about ambiguous patch name when using patch index (issue1439)



Jason Orendorff <jorendorff@mozilla.com>


parents: 
4432

diff
changeset




    11


% Using index








9110






561ff8d9e4f0
mq: qpop now tells which patches are popped



Mads Kiilerich <mads@kiilerich.com>


parents: 
7627

diff
changeset




    12


popping b.patch








7627






fb32ae9c76e7
mq: lowercase output



Martin Geisler <mg@daimi.au.dk>


parents: 
7568

diff
changeset




    13


now at: a.patch








7568






12df451ce205
mq: don't warn about ambiguous patch name when using patch index (issue1439)



Jason Orendorff <jorendorff@mozilla.com>


parents: 
4432

diff
changeset




    14


applying b.patch













12df451ce205
mq: don't warn about ambiguous patch name when using patch index (issue1439)



Jason Orendorff <jorendorff@mozilla.com>


parents: 
4432

diff
changeset




    15


applying c.patch








7627






fb32ae9c76e7
mq: lowercase output



Martin Geisler <mg@daimi.au.dk>


parents: 
7568

diff
changeset




    16


now at: c.patch








7568






12df451ce205
mq: don't warn about ambiguous patch name when using patch index (issue1439)



Jason Orendorff <jorendorff@mozilla.com>


parents: 
4432

diff
changeset




    17














12df451ce205
mq: don't warn about ambiguous patch name when using patch index (issue1439)



Jason Orendorff <jorendorff@mozilla.com>


parents: 
4432

diff
changeset




    18


% No warnings when using index








9110






561ff8d9e4f0
mq: qpop now tells which patches are popped



Mads Kiilerich <mads@kiilerich.com>


parents: 
7627

diff
changeset




    19


popping bug141421













561ff8d9e4f0
mq: qpop now tells which patches are popped



Mads Kiilerich <mads@kiilerich.com>


parents: 
7627

diff
changeset




    20


popping bug314159













561ff8d9e4f0
mq: qpop now tells which patches are popped



Mads Kiilerich <mads@kiilerich.com>


parents: 
7627

diff
changeset




    21


popping c.patch








7627






fb32ae9c76e7
mq: lowercase output



Martin Geisler <mg@daimi.au.dk>


parents: 
7568

diff
changeset




    22


now at: b.patch








7568






12df451ce205
mq: don't warn about ambiguous patch name when using patch index (issue1439)



Jason Orendorff <jorendorff@mozilla.com>


parents: 
4432

diff
changeset




    23


applying c.patch













12df451ce205
mq: don't warn about ambiguous patch name when using patch index (issue1439)



Jason Orendorff <jorendorff@mozilla.com>


parents: 
4432

diff
changeset




    24


applying bug314159








7627






fb32ae9c76e7
mq: lowercase output



Martin Geisler <mg@daimi.au.dk>


parents: 
7568

diff
changeset




    25


now at: bug314159








7568






12df451ce205
mq: don't warn about ambiguous patch name when using patch index (issue1439)



Jason Orendorff <jorendorff@mozilla.com>


parents: 
4432

diff
changeset




    26














12df451ce205
mq: don't warn about ambiguous patch name when using patch index (issue1439)



Jason Orendorff <jorendorff@mozilla.com>


parents: 
4432

diff
changeset




    27


% Detect ambiguous non-index













12df451ce205
mq: don't warn about ambiguous patch name when using patch index (issue1439)



Jason Orendorff <jorendorff@mozilla.com>


parents: 
4432

diff
changeset




    28


patch name "14" is ambiguous:













12df451ce205
mq: don't warn about ambiguous patch name when using patch index (issue1439)



Jason Orendorff <jorendorff@mozilla.com>


parents: 
4432

diff
changeset




    29


  bug314159













12df451ce205
mq: don't warn about ambiguous patch name when using patch index (issue1439)



Jason Orendorff <jorendorff@mozilla.com>


parents: 
4432

diff
changeset




    30


  bug141421













12df451ce205
mq: don't warn about ambiguous patch name when using patch index (issue1439)



Jason Orendorff <jorendorff@mozilla.com>


parents: 
4432

diff
changeset




    31


abort: patch 14 not in series















Mercurial