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-abort.out
author David Champion <dgc@uchicago.edu>
Mon, 10 May 2010 11:04:56 -0500
changeset 11148 a912f26777d3
parent 6906 808f03f61ebe
child 11198 b345b1cc124f
permissions -rw-r--r--
merge: introduce tool.check parameter tool.check is a list of check options, and can be used in place of tool.checkchanged and tool.checkconflicts: Equivalences: tool.checkchanged = yes tool.checkconflicts = no tool.check = changed tool.checkchanged = no tool.checkconflicts = yes tool.check = conflicts tool.checkchanged = yes tool.checkconflicts = yes tool.check = changed, conflicts Add _toollist() wrapper for ui.configlist() to implement this consistently. checkchanged and checkconflicts are still supported, but check is preferred for implementing new check options.
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
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     2
 
created new head
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     3
 
@  4: L2
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     4
 
|
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     5
 
o  3: L1
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
 
| o  2: C3
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     8
 
|/
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     9
 
o  1: C2
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
    10
 
|
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
    11
 
o  0: C1
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
    12
 












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


% Conflicting rebase













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    15


merging common













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    16


warning: conflicts during merge.













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    17


merging common failed!













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    18


abort: fix unresolved conflicts with hg resolve then run hg rebase --continue













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    19














808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    20


% Abort













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    21


rebase aborted













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    22


@  4: L2













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    23


|













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    24


o  3: L1













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    25


|













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    26


| o  2: C3













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    27


|/













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    28


o  1: C2













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    29


|













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    30


o  0: C1













808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    31
















Mercurial