view tests/test-convert-bzr-merges.out @ 11524:24965bb270b7

dispatch: add shell aliases This patch adds git-style "shell aliases" to Mercurial. Any alias with a definition beginning with a '!' will be treated as a shell alias. For example: [alias] echo = !echo qempty = !hg qrefresh -X "`hg root`" ; echo Emptied patch "`hg qtop`" $ hg echo foo foo $ hg qempty Emptied patch foo $
author Steve Losh <steve@stevelosh.com>
date Wed, 07 Jul 2010 18:49:43 -0400
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