Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-mq-qrefresh-replace-log-message @ 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 | 448eb46d4d84 |
children |
line wrap: on
line source
#!/bin/sh # Environement setup for MQ echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH #Repo init hg init hg qinit echo ======================= echo "Should fail if no patches applied" hg qrefresh hg qrefresh -e hg qnew -m "First commit message" first-patch echo aaaa > file hg add file hg qrefresh echo ======================= echo "Should display 'First commit message'" hg log -l1 -v | sed -n '/description/,$p' echo # Testing changing message with -m echo bbbb > file hg qrefresh -m "Second commit message" echo ======================= echo "Should display 'Second commit message'" hg log -l1 -v | sed -n '/description/,$p' echo # Testing changing message with -l echo "Third commit message" > logfile echo " This is the 3rd log message" >> logfile echo bbbb > file hg qrefresh -l logfile echo ======================= printf "Should display 'Third commit message\\\n This is the 3rd log message'\n" hg log -l1 -v | sed -n '/description/,$p' echo # Testing changing message with -l- hg qnew -m "First commit message" second-patch echo aaaa > file2 hg add file2 echo bbbb > file2 (echo "Fifth commit message" echo " This is the 5th log message" >> logfile) |\ hg qrefresh -l- echo ======================= printf "Should display 'Fifth commit message\\\n This is the 5th log message'\n" hg log -l1 -v | sed -n '/description/,$p' echo