comparison tests/test-import.out @ 5757:c5793dada959

Clarify some messages during commit: - use "branch 'foo'" to distinguish from "branch merge". - commit messags can be empty (to abort commits) - Added value for editor message: Tell about HG: lines like CVS does.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 28 Dec 2007 17:10:25 +0100
parents 75c2071385da
children deb0d3518674
comparison
equal deleted inserted replaced
5756:6183df642f95 5757:c5793dada959
20 added 1 changesets with 2 changes to 2 files 20 added 1 changesets with 2 changes to 2 files
21 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 21 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
22 applying ../tip.patch 22 applying ../tip.patch
23 transaction abort! 23 transaction abort!
24 rollback completed 24 rollback completed
25 abort: commit message cannot be left blank 25 abort: empty commit message
26 % import of plain diff should be ok with message 26 % import of plain diff should be ok with message
27 requesting all changes 27 requesting all changes
28 adding changesets 28 adding changesets
29 adding manifests 29 adding manifests
30 adding file changes 30 adding file changes
90 added 1 changesets with 2 changes to 2 files 90 added 1 changesets with 2 changes to 2 files
91 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 91 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
92 applying patch from stdin 92 applying patch from stdin
93 transaction abort! 93 transaction abort!
94 rollback completed 94 rollback completed
95 abort: commit message cannot be left blank 95 abort: empty commit message
96 % hg export in email, should use patch header 96 % hg export in email, should use patch header
97 requesting all changes 97 requesting all changes
98 adding changesets 98 adding changesets
99 adding manifests 99 adding manifests
100 adding file changes 100 adding file changes