[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 941ca0c2752a096e4035c7366c9588c3a19f41
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 941ca0c2752a096e4035c7366c9588c3a19f418f |
Date: |
Mon, 4 Feb 2008 12:06:28 +0100 |
-----------------------------------------------------------------
Revision: 941ca0c2752a096e4035c7366c9588c3a19f418f
Ancestor: 59f939d5f1dd78058ba7b8752b110d76705d74da
Author: address@hidden
Date: 2008-02-04T10:23:46
Branch: net.venge.monotone
Added files:
tests/merge_update_part_of_file/__driver__.lua
tests/merge_update_part_of_file/after.diff
tests/merge_update_part_of_file/before.diff
tests/merge_update_part_of_file/onechange
tests/merge_update_part_of_file/original
tests/merge_update_part_of_file/twochanges
Added directories:
tests/merge_update_part_of_file
ChangeLog:
New merge_update_part_of_file test
This adds a new test for a merge failure I have just found while working
on ATF. This problem appears when running 'update' on a tree that has a
file that already carries part of the changes that are in the target
revision. These already-committed changes confuse the merge algorithm
because the removed text is very similar to the text that is left.
This check fails with the current version of monotone and I have no fix
for it. Hopefully having this test in the tree will force someone
knowledgeable enough to look at it, and it won't get lost.
txtPSLvrDsmvS.txt
Description: Diff [59f939d5f1dd78058ba7b8752b110d76705d74da] -> [941ca0c2752a096e4035c7366c9588c3a19f418f]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 941ca0c2752a096e4035c7366c9588c3a19f418f,
monotone <=