[Monotone-commits-diffs] Revision 598003d09dcb8002a8fd2d55d56c6d4ac0e243e1

[monotone]

-----------------------------------------------------------------
Revision: 598003d09dcb8002a8fd2d55d56c6d4ac0e243e1
Ancestor: 9dcf74595a12048481267b897683438c7fa16f4e
Author: address@hidden
Date: 2008-06-16T10:19:30
Branch: net.venge.monotone.automate_show_conflict

Modified files:
        cmd_merging.cc roster.cc roster.hh work.cc work.hh

ChangeLog: 

Better implementation of new update algorithm. However, it does not match user 
expectations in some cases.

* cmd_merging.cc (CMD update): Better implementation of new update
  algorithm, using new work.get_current_roster.

* roster.hh:
* roster.cc: Delete make_working_markings; use new
  work.get_current_roster instead.

* work.hh:
* work.cc (workspace::get_current_roster): new; returns roster and markings.

txt5vAVz13JLg.txt
Description: Diff [9dcf74595a12048481267b897683438c7fa16f4e] -> [598003d09dcb8002a8fd2d55d56c6d4ac0e243e1]