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-conflicts.out
author Sol Jerome <sol.jerome@gmail.com>
Tue, 17 Aug 2010 17:38:19 -0500
branchstable
changeset 12051 ff5cec76b1c5
parent 11203 7a9cf012dddc
permissions -rw-r--r--
util: avoid using hashlib on Python < 2.5 (issue2278) The following patch allows the use of python2.4 with a standalone hashlib rather than assuming that python2.5 is in use when hashlib is imported successfully.
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
7278
45495d784ad6 rebase: avoid redundant merges (issue1301)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 6906
diff changeset 
     3
 
@  5: L3
45495d784ad6 rebase: avoid redundant merges (issue1301)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 6906
diff changeset 
     4
 
|
45495d784ad6 rebase: avoid redundant merges (issue1301)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 6906
diff changeset 
     5
 
o  4: L2
6906
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  3: L1
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  2: C3
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  1: C2
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
 
o  0: C1
808f03f61ebe Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
    14
 












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


% Try to call --continue












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    17


abort: no rebase in progress












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


% Conflicting rebase












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    20


merging common












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    21


warning: conflicts during merge.












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    22


merging common failed!












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    23


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




    24














808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    25


% Try to continue without solving the conflict












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    26


abort: unresolved merge conflicts (see hg resolve)












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


% Conclude rebase







11201






34023f2ca305
Fix up rebase's handling of strip backups



Matt Mackall <mpm@selenic.com>


parents: 
11197

diff
changeset




    29


saved backup bundle to 







7278






45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    30


@  5: L3












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    31


|












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    32


o  4: L2







6906






808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    33


|












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    34


o  3: L1












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


o  2: C3












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    37


|












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    38


o  1: C2












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    39


|












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    40


o  0: C1












808f03f61ebe
Add rebase extension



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    41









7278






45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    42














45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    43


% Check correctness












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    44


  - Rev. 0












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    45


c1












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    46


  - Rev. 1












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    47


c1












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    48


c2












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    49


  - Rev. 2












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    50


c1












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    51


c2












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    52


c3












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    53


  - Rev. 3












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    54


c1












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    55


c2












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    56


c3












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    57


  - Rev. 4












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    58


resolved merge












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    59


  - Rev. 5












45495d784ad6
rebase: avoid redundant merges (issue1301)



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 
6906

diff
changeset




    60


resolved merge














mercurial