Mercurial > hg
view tests/test-rebase-issue-noparam-single-rev.out @ 11346:e740f36cfb4b
tests: rename test-merge3 to test-add-remove.
It tests that 'hg commit' does not crash if the user removes a newly
added file, which has nothing to do with merging.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 14 Jun 2010 13:39:00 -0400 |
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