Mercurial > hg
view tests/test-convert-bzr-merges.out @ 8894:868670dbc237
extensions: improve the consistency of synopses
Trying as much as possible to consistently:
- use a present tense predicate followed by a direct object
- verb referring directly to the functionality provided
(ie. not "add command that does this" but simple "do that")
- keep simple and to the point, leaving details for the long help
(width is tight, possibly even more so for translations)
Thanks to timeless, Martin Geisler, Rafael Villar Burke, Dan Villiom
Podlaski Christiansen and others for the helpful suggestions.
author | Cédric Duval <cedricduval@free.fr> |
---|---|
date | Mon, 22 Jun 2009 15:48:08 +0200 |
parents | 209ef5f3534c |
children |
line wrap: on
line source
% test multiple merges at once initializing destination source-hg repository scanning source... sorting... converting... 4 Initial add 3 Added branch1 file 2 Added parent file 1 Added brach2 file 0 Merged branches o 5 "(octopus merge fixup)" files: |\ | o 4 "Merged branches" files: file-branch2 | |\ o---+ 3 "Added brach2 file" files: file-branch2 / / | o 2 "Added parent file" files: file-parent | | o | 1 "Added branch1 file" files: file file-branch1 |/ o 0 "Initial add" files: file % manifest of tip 644 file 644 file-branch1 644 file-branch2 644 file-parent