view tests/test-rebase-issue-noparam-single-rev.out @ 12114:0a6b2e21bc86

tests: merge the two test-rename-dir-merge* into one
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Mon, 30 Aug 2010 13:55:57 +0900
parents 7a9cf012dddc
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
@  4:r2
|
o  3:r1
|
| o  2:l1
|/
o  1:c2
|
o  0:c1


% Rebase with no arguments - single revision in source branch
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
saved backup bundle to 
@  4:l1
|
o  3:r2
|
o  2:r1
|
o  1:c2
|
o  0:c1

0 files updated, 0 files merged, 2 files removed, 0 files unresolved
created new head
@  4:r1
|
| o  3:l2
| |
| o  2:l1
|/
o  1:c2
|
o  0:c1


% Rebase with no arguments - single revision in target branch
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to 
@  4:l2
|
o  3:l1
|
o  2:r1
|
o  1:c2
|
o  0:c1