Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-simplemerge-cmd @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
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