view tests/test-mq-qrefresh-replace-log-message.out @ 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

=======================
Should fail if no patches applied
No patches applied
No patches applied
=======================
Should display 'First commit message'
description:
First commit message



=======================
Should display 'Second commit message'
description:
Second commit message



=======================
Should display 'Third commit message\n This is the 3rd log message'
description:
Third commit message
 This is the 3rd log message



=======================
Should display 'Fifth commit message\n This is the 5th log message'
description:
Fifth commit message