Mercurial > hg
view tests/test-simplemerge-cmd.out @ 8564:6b9ec23b09fc
named branches: improve pre-push logic (issue736)
Each named branch is considered separately, and the push is allowed if
no new branch heads are created for any named branch to be pushed.
Due to some tests's use of --debug, their output will change after this
addition. This has been fixed as well.
Co-contributor: Henrik Stuart <henrik.stuart@edlund.dk>
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Sat, 23 May 2009 17:04:31 +0200 |
parents | e1f4343db740 |
children |
line wrap: on
line source
% changing local directly merge succeeded local base other % printing to stdout local base other local: local base % conflicts base <<<<<<< conflict-local not other ======= other >>>>>>> conflict-other end warning: conflicts during merge. merge failed % --no-minimal base <<<<<<< conflict-local not other end ======= other end >>>>>>> conflict-other warning: conflicts during merge. % 1 label base <<<<<<< foo not other ======= other >>>>>>> conflict-other end warning: conflicts during merge. % 2 labels base <<<<<<< foo not other ======= other >>>>>>> bar end warning: conflicts during merge. % too many labels abort: can only specify two labels. % binary file abort: binary-local looks like a binary file. % binary file --text warning: binary-local looks like a binary file. \x00local base other % help simplemerge [OPTS] LOCAL BASE OTHER Simple three-way file merge utility with a minimal feature set. Apply to LOCAL the changes necessary to go from BASE to OTHER. By default, LOCAL is overwritten with the results of this operation. options: -L --label labels to use on conflict markers -a --text treat all files as text -p --print print results instead of overwriting LOCAL --no-minimal do not try to minimize conflict regions -h --help display help and exit -q --quiet suppress output % wrong number of arguments simplemerge: wrong number of arguments simplemerge [OPTS] LOCAL BASE OTHER Simple three-way file merge utility with a minimal feature set. Apply to LOCAL the changes necessary to go from BASE to OTHER. By default, LOCAL is overwritten with the results of this operation. options: -L --label labels to use on conflict markers -a --text treat all files as text -p --print print results instead of overwriting LOCAL --no-minimal do not try to minimize conflict regions -h --help display help and exit -q --quiet suppress output % bad option simplemerge: option --foo not recognized simplemerge [OPTS] LOCAL BASE OTHER Simple three-way file merge utility with a minimal feature set. Apply to LOCAL the changes necessary to go from BASE to OTHER. By default, LOCAL is overwritten with the results of this operation. options: -L --label labels to use on conflict markers -a --text treat all files as text -p --print print results instead of overwriting LOCAL --no-minimal do not try to minimize conflict regions -h --help display help and exit -q --quiet suppress output