Mercurial Mercurial > mercurial / 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-interruptions.out
author Martin Geisler <mg@lazybytes.net>
Sun, 04 Oct 2009 22:03:41 +0200
changeset 10443 62d484a81dfe
parent 6906 808f03f61ebe
child 11198 b345b1cc124f
permissions -rw-r--r--
minirst: support containers Text can be grouped into generic containers in reStructuredText: .. container:: foo This is text inside a "foo" container. .. container:: bar This is nested inside two containers. The minirst parser now recognizes these containers. The containers are either pruned completely from the output (included all nested blocks) or they are simply un-indented. So if 'foo' and 'bar' containers are kept, the above example will result in: This is text inside a "foo" container. This is nested inside two containers. If only 'foo' containers are kept, we get: This is text inside a "foo" container. No output is made if only 'bar' containers are kept. This feature will come in handy for implementing different levels of help output (e.g., verbose and debug level help texts).
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
 
% Changes during an interruption - continue
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     2
 
@  4: E
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     3
 
|
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     4
 
o  3: D
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     5
 
|
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     6
 
| o  2: C
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     7
 
| |
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     8
 
| o  1: B
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     9
 
|/
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
    10
 
o  0: A
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














808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    13


% - Rebasing B onto E












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    14


merging A












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    15


warning: conflicts during merge.












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    16


merging A failed!












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    17


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




    18














808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    19


% - Force a commit on C during the interruption












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    20


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












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    21


@  6: Extra












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    22


|












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    23


| o  5: B












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    24


| |












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    25


| o  4: E












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    26


| |












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    27


| o  3: D












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    28


| |












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    29


o |  2: C












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    30


| |












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    31


o |  1: B












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    32


|/












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    33


o  0: A












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    34














808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    35














808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    36


% - Resume the rebasing












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    37


merging A












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    38


warning: conflicts during merge.












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    39


merging A failed!












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    40


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




    41














808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    42


% - Solve the conflict and go on












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    43


warning: new changesets detected on source branch, not stripping












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    44


rebase completed












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    45


@  7: C












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    46


|












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    47


| o  6: Extra












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    48


| |












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    49


o |  5: B












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    50


| |












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    51


o |  4: E












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    52


| |












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    53


o |  3: D












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    54


| |












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    55


| o  2: C












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    56


| |












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    57


| o  1: B












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    58


|/












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    59


o  0: A












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    60














808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    61














808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    62














808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    63


% Changes during an interruption - abort












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    64


@  4: E












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    65


|












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    66


o  3: D












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    67


|












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    68


| o  2: C












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    69


| |












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    70


| o  1: B












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    71


|/












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    72


o  0: A












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    73














808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    74














808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    75


% Rebasing B onto E












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    76


merging A












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    77


warning: conflicts during merge.












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    78


merging A failed!












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    79


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




    80














808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    81


% Force a commit on B' during the interruption












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    82


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




    83


@  6: Extra












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    84


|












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    85


o  5: B












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    86


|












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    87


o  4: E












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    88


|












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    89


o  3: D












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    90


|












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    91


| o  2: C












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    92


| |












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    93


| o  1: B












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    94


|/












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    95


o  0: A












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    96














808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    97














808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    98


% Abort the rebasing












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    99


warning: new changesets detected on target branch, not stripping












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




   100


@  6: Extra












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




   101


|












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




   102


o  5: B












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




   103


|












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




   104


o  4: E












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




   105


|












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




   106


o  3: D












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




   107


|












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




   108


| o  2: C












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




   109


| |












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




   110


| o  1: B












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




   111


|/












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




   112


o  0: A












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




   113
















mercurial