Mercurial Mercurial > hg-stable / comparison
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-check-restore.t
branchstable
changeset 12896 b19b4c1df066
parent 12640 6cc4b14fb76b
child 15501 2371f4aea665
child 15615 41885892796e
equal deleted inserted replaced
12895:53cfde2b3cf9 12896:b19b4c1df066 
    62   
    62   
    63   $ hg rebase -s 1 -d 4 --keep
 
    63   $ hg rebase -s 1 -d 4 --keep
 
    64   merging A
 
    64   merging A
 
    65   warning: conflicts during merge.
 
    65   warning: conflicts during merge.
 
    66   merging A failed!
 
    66   merging A failed!
 
    67   abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
 
    67   abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
 
    68   [255]
 
    68   [255]
 
    69 
    69 
    70 Solve the conflict and go on:
 
    70 Solve the conflict and go on:
 
    71 
    71 
    72   $ echo 'conflict solved' > A
 
    72   $ echo 'conflict solved' > A
 
   114   
   114   
   115   $ hg rebase -s 5 -d 4 --keepbranches
 
   115   $ hg rebase -s 5 -d 4 --keepbranches
 
   116   merging A
 
   116   merging A
 
   117   warning: conflicts during merge.
 
   117   warning: conflicts during merge.
 
   118   merging A failed!
 
   118   merging A failed!
 
   119   abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
 
   119   abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
 
   120   [255]
 
   120   [255]
 
   121 
   121 
   122 Solve the conflict and go on:
 
   122 Solve the conflict and go on:
 
   123 
   123 
   124   $ echo 'conflict solved' > A
 
   124   $ echo 'conflict solved' > A
hg-stable