[Monotone-commits-diffs] Revision daf61ccb98db69b00eec9052c063f3a227e066fe

[monotone]

-----------------------------------------------------------------
Revision: daf61ccb98db69b00eec9052c063f3a227e066fe
Ancestor: e049796e9dfbbf59177aa5f1c26a68bd23837cc2
Author: address@hidden
Date: 2008-09-10T10:12:29
Branch: net.venge.monotone.resolve_conflicts

Modified files:
        paths.cc paths.hh
        tests/automate_show_conflicts/expected-directory-loop.stdout
        tests/empty_string_as_a_path_name/__driver__.lua
        tests/resolve_duplicate_name_conflict/merge-1

ChangeLog: 

Fix failing tests.

* paths.cc (UNIT_TEST): '""' is now a valid external file name. Resolve
  FIXME about paths with '//' in them; now handled properly (actually
  fixed when boost:fs was eliminated).

* paths.hh: Add rationale for allowing '""' as external file name.

* tests/automate_show_conflicts/expected-directory-loop.stdout: Match
  symbol change.

* tests/empty_string_as_a_path_name/__driver__.lua: Add comments,
  'revert' can now accept '""'.

* tests/resolve_duplicate_name_conflict/merge-1: Match fixed bug.

txtgsMR3ifJVb.txt
Description: Diff [e049796e9dfbbf59177aa5f1c26a68bd23837cc2] -> [daf61ccb98db69b00eec9052c063f3a227e066fe]