[Monotone-commits-nodiffs] Revision a4fcb943420377806dddd82b550ea6a542c6b80e

[monotone]

-----------------------------------------------------------------
Revision: a4fcb943420377806dddd82b550ea6a542c6b80e
Ancestor: 13f096de421cce3873c182bab60acc25aaeaa34a
Author: address@hidden
Date: 2008-10-26T14:06:21
Branch: net.venge.monotone.resolve_conflicts

Modified files:
        paths.cc
        tests/resolve_conflicts_all_merge_commands/__driver__.lua
        tests/resolve_conflicts_all_resolutions/__driver__.lua
        tests/resolve_conflicts_all_resolutions/merge-1

ChangeLog: 

all tests except schema_migration_with_rosterify pass.

* paths.cc (bookkeeping_path::external_string_is_bookkeeping_path): call
  normalize_external_path with 'to_workspace_root' false, to match
  earlier behavior.

* tests/resolve_conflicts_all_merge_commands/__driver__.lua: cleanup comments,
  finish last test.

* tests/resolve_conflicts_all_resolutions/merge-1:
* tests/resolve_conflicts_all_resolutions/__driver__.lua: use
  'explicit_merge' to match rev order.




monotone --db={your.database} diff 
--revision=13f096de421cce3873c182bab60acc25aaeaa34a 
--revision=a4fcb943420377806dddd82b550ea6a542c6b80e
----------------------------------------------------------------------