tests/test-rebase-mq.t
branchstable
changeset 21947 b081decd9062
parent 21267 e4f451c8c05c
child 23515 7856a87bbb02
equal deleted inserted replaced
21946:868e2cea3ea0 21947:b081decd9062
    67 
    67 
    68 Fix the 1st conflict:
    68 Fix the 1st conflict:
    69 
    69 
    70   $ echo mq1r1 > f
    70   $ echo mq1r1 > f
    71   $ hg resolve -m f
    71   $ hg resolve -m f
    72   no more unresolved files
    72   (no more unresolved files)
    73   $ hg rebase -c
    73   $ hg rebase -c
    74   merging f
    74   merging f
    75   warning: conflicts during merge.
    75   warning: conflicts during merge.
    76   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
    76   merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
    77   unresolved conflicts (see hg resolve, then hg rebase --continue)
    77   unresolved conflicts (see hg resolve, then hg rebase --continue)
    79 
    79 
    80 Fix the 2nd conflict:
    80 Fix the 2nd conflict:
    81 
    81 
    82   $ echo mq1r1mq2 > f
    82   $ echo mq1r1mq2 > f
    83   $ hg resolve -m f
    83   $ hg resolve -m f
    84   no more unresolved files
    84   (no more unresolved files)
    85   $ hg rebase -c
    85   $ hg rebase -c
    86   saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
    86   saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
    87 
    87 
    88   $ hg tglog
    88   $ hg tglog
    89   @  3: 'P1' tags: f2.patch qtip tip
    89   @  3: 'P1' tags: f2.patch qtip tip