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-rebase-mq-skip.out
author Brodie Rao <brodie@bitheap.org>
Thu, 01 Jul 2010 19:23:26 -0500
branchstable
changeset 11555 d8d0fc3988ca
parent 11203 7a9cf012dddc
child 11843 00f8e7837668
permissions -rw-r--r--
color/progress: subclass ui instead of using wrapfunction (issue2096) This resolves the issue of hg cmd --mq not being colorized. This was due to color wrapping only the instance of ui passed to dispatch._runcommand(), which isn't the same ui object that mq.mqcommand() receives. After dispatch calls extensions.loadall(), it makes sure any changes to ui.__class__ in uisetup are propagated. progress is updated to wrap ui in the same manner because wrapfunction doesn't play well when ui.__class__ has been replaced by another extension (orig will point to the old class method instead of color's).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6906
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     1
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     2
 












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




     3


% "Mainstream" import p1.patch













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




     4


1 files updated, 0 files merged, 2 files removed, 0 files unresolved













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




     5


applying p1.patch













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




     6














808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




     7


% Rebase













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




     8


1 files updated, 0 files merged, 1 files removed, 0 files unresolved








11201






34023f2ca305
Fix up rebase's handling of strip backups



Matt Mackall <mpm@selenic.com>


parents: 
11197

diff
changeset




     9


saved backup bundle to 








11047






c7dbd6c4877a
tags: return tags in sorted order



Eric Eisner <ede@mit.edu>


parents: 
8995

diff
changeset




    10


@  3 P0 tags: p0.patch qbase qtip tip








6906






808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    11


|













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    12


o  2 P1 tags: qparent













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    13


|













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    14


o  1 R1 tags:













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    15


|













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    16


o  0 C1 tags:













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    17
















Mercurial