view tests/test-simplemerge-cmd @ 4589:451e91ed535e

convert extension: Add support for username mapping Allows mapping usernames to new ones during conversion process. - Use -A option for first import - Then at the end of the conversion process and if the destination repo supports authorfile attribute, author map content is copied to the file pointed by the authorfile call. - On incremental conversions w/o any -A option specified, the destination authorfile, if any, gets read automatically. EG: This allows mapping unix system usernames used in CVS accounts to a more typical "Firstname Lastname <address@server.org>" pair.
author Edouard Gomez <ed.gomez@free.fr>
date Thu, 14 Jun 2007 23:25:55 +0200
parents c6413f8f2f8e
children
line wrap: on
line source

#!/bin/sh

cp "$TESTDIR"/../contrib/simplemerge .

echo base > base

echo local > local
cat base >> local
cp local orig

cat base > other
echo other >> other

echo '% changing local directly'
python simplemerge local base other && echo "merge succeeded"
cat local
cp orig local

echo '% printing to stdout'
python simplemerge -p local base other
echo ' local:'
cat local

echo '% conflicts'
cp base conflict-local
cp other conflict-other
echo not other >> conflict-local
echo end >> conflict-local
echo end >> conflict-other
python simplemerge -p conflict-local base conflict-other || echo "merge failed"

echo '% --no-minimal'
python simplemerge -p --no-minimal conflict-local base conflict-other

echo '% 1 label'
python simplemerge -p -L foo conflict-local base conflict-other

echo '% 2 labels'
python simplemerge -p -L foo -L bar conflict-local base conflict-other

echo '% too many labels'
python simplemerge -p -L foo -L bar -L baz conflict-local base conflict-other

echo '% binary file'
python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()"
cat orig >> binary-local
python simplemerge -p binary-local base other

echo '% binary file --text'
python simplemerge -a -p binary-local base other

echo '% help'
python simplemerge --help

echo '% wrong number of arguments'
python simplemerge

echo '% bad option'
python simplemerge --foo -p local base other

exit 0