view tests/test-rebase-parameters.out @ 12196:e42bc7f66e25

patchbomb: use ui.promptchoice for diffstat to allow localization of choices The extra check for ui.interacive from patchbomb's prompt function is not needed here. Format boolean prompt as in filemerge.py.
author Christian Ebert <blacktrash@gmx.net>
date Wed, 08 Sep 2010 08:31:07 +0200
parents f118029e534c
children
line wrap: on
line source

% These fail

% Use continue and abort
abort: cannot use both abort and continue

% Use continue and collapse
abort: cannot use collapse with continue or abort

% Use continue/abort and dest/source
abort: abort and continue do not allow specifying revisions

% Use source and base
abort: cannot specify both a revision and a base

% Rebase with no arguments - from current
nothing to rebase

% Rebase with no arguments - from the current branch
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
nothing to rebase
% ----------
% These work

% Rebase with no arguments (from 3 onto 7)
3 files updated, 0 files merged, 2 files removed, 0 files unresolved
saved backup bundle to 
% Try to rollback after a rebase (fail)
no rollback information available

% Rebase with base == '.' => same as no arguments (from 3 onto 7)
3 files updated, 0 files merged, 3 files removed, 0 files unresolved
saved backup bundle to 

% Rebase with dest == default => same as no arguments (from 3 onto 7)
3 files updated, 0 files merged, 3 files removed, 0 files unresolved
saved backup bundle to 

% Specify only source (from 4 onto 7)
saved backup bundle to 

% Specify only dest (from 3 onto 6)
3 files updated, 0 files merged, 3 files removed, 0 files unresolved
saved backup bundle to 

% Specify only base (from 3 onto 7)
saved backup bundle to 

% Specify source and dest (from 4 onto 6)
saved backup bundle to 

% Specify base and dest (from 3 onto 6)
saved backup bundle to