[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision efcd324d5687d46580fe1d378d829e0486514a
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision efcd324d5687d46580fe1d378d829e0486514ab3 |
Date: |
Tue, 15 Apr 2008 16:06:02 +0200 |
-----------------------------------------------------------------
Revision: efcd324d5687d46580fe1d378d829e0486514ab3
Ancestor: 9be4afa01a24c4d3ecdaea260aa8af2772d4af23
Author: address@hidden
Date: 2008-03-31T17:57:18
Branch: net.venge.monotone.automate_show_conflict
Deleted entries:
tests/automate_show_conflicts_options/expected-1.stdout
tests/automate_show_conflicts_options/expected-2.stdout
Renamed entries:
tests/automate_show_conflicts_options to
tests/automate_show_conflicts_defaults
Modified files:
cmd_merging.cc monotone.texi
tests/automate_show_conflicts_defaults/__driver__.lua
tests/common/test_utils_inventory.lua
ChangeLog:
automate show_conflicts: use merge algorithm to pick default heads.
* cmd_merging.cc (find_heads_to_merge): New function, factored out of
merge for use in 'automate_show_conflicts'.
(CMD merge): Use it.
(CMD_AUTOMATE show_conflicts): Use it.
* monotone.texi (Automation show_conflicts): Fix compilation errors, clean up.
* tests/automate_show_conflicts_defaults: renamed from
automate_show_conflicts_options.
* tests/automate_show_conflicts_defaults/__driver__.lua: Test picking
default heads.
* tests/automate_show_conflicts_options/expected-2.stdout:
* tests/automate_show_conflicts_options/expected-1.stdout: Deleted; no
longer used.
* tests/common/test_utils_inventory.lua: Improve comments.
txtWEEZwvQD_n.txt
Description: Diff [9be4afa01a24c4d3ecdaea260aa8af2772d4af23] -> [efcd324d5687d46580fe1d378d829e0486514ab3]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision efcd324d5687d46580fe1d378d829e0486514ab3,
monotone <=