[Monotone-commits-diffs] Revision d779238b0a2ad2ce4ca878a118c87e6389c78f65

[monotone]

-----------------------------------------------------------------
Revision: d779238b0a2ad2ce4ca878a118c87e6389c78f65
Ancestor: da31a68b394022b3292483bffde58e9885719ae7
Author: address@hidden
Date: 2008-03-27T22:13:00
Branch: net.venge.monotone

Modified files:
        roster_merge.cc
        tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua

ChangeLog: 

 * roster_merge.cc: even on duplicate names, full path names must not be
   equal, because of possible parent directory renames. Thus I've removed
   that invariant, and corrected the error message accordingly.
 * tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua:
   we are expecting that test to pass from now on.

txtZFtT_YbSRv.txt
Description: Diff [da31a68b394022b3292483bffde58e9885719ae7] -> [d779238b0a2ad2ce4ca878a118c87e6389c78f65]