# # # patch "NEWS" # from [0a38b76c36a4842e734564c1aae26fb9a46c2feb] # to [09081f8123088e578ddd129a3ee1bb70731cdcf9] # # patch "cmd_ws_commit.cc" # from [916e22324066a0e9a832b686c7a54822ddaf26fa] # to [a9581fa74b19c546d6408f2460b6bce8dab7eff2] # ============================================================ --- NEWS 0a38b76c36a4842e734564c1aae26fb9a46c2feb +++ NEWS 09081f8123088e578ddd129a3ee1bb70731cdcf9 @@ -1,3 +1,14 @@ +??? ??? ?? ??:??:?? UTC 2009 + + 0.46 release. + + New features + + - A new 'bisect' command has been added to allow searching for a + specific revision within a range of revisions. This can be useful for + locating the exact revision that broke something or removed a + particular feature. + Fri Sep 11 20:50:00 UTC 2009 0.45 release. ============================================================ --- cmd_ws_commit.cc 916e22324066a0e9a832b686c7a54822ddaf26fa +++ cmd_ws_commit.cc a9581fa74b19c546d6408f2460b6bce8dab7eff2 @@ -1593,8 +1593,6 @@ bisect_update(app_state & app, commands: E(app.opts.revision_selectors.size() < 2, origin::user, F("bisect allows only one revision selector")); - // FIXME: ensure workspace is clean for bisecting - parent_map parents; work.get_parent_rosters(db, parents); E(parents.size() == 1, origin::user, @@ -1756,7 +1754,7 @@ bisect_update(app_state & app, commands: make_cset(source_roster, target_roster, update); content_merge_checkout_adaptor adaptor(db); - work.perform_content_update(db, update, adaptor); + work.perform_content_update(source_roster, target_roster, update, adaptor); revision_t workrev; cset empty;