view tests/test-mq-qrefresh-replace-log-message.out @ 5149:ad6b97132b81

merge: fix a copy detection bug (issue672) When merging rev1 and rev2, we want to search for copies that happened in rev1 but not in rev2 and vice-versa. We were starting the search at rev1/rev2 and then going back, stopping as soon as we reached the revno of the ancestor, but that can miss some cases (see the new test-issue672). Now we calculate the revisions that are ancestors of rev1 or rev2 (but not both) and make sure the search doesn't stop too early. Simplified test provided by mpm, based on a test case provided by Edward Lee.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 12 Aug 2007 12:15:10 -0300
parents 0fb28dbf0dc7
children 448eb46d4d84
line wrap: on
line source

=======================
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