[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 7133f78685d0bf43123fafd6387407ef26f2ef
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 7133f78685d0bf43123fafd6387407ef26f2ef14 |
Date: |
Sun, 23 Mar 2008 21:05:58 +0100 |
-----------------------------------------------------------------
Revision: 7133f78685d0bf43123fafd6387407ef26f2ef14
Ancestor: 5c7d3a8c99168c3ccadb0a268a49b14cb5e7725f
Author: address@hidden
Date: 2008-03-22T07:21:09
Branch: net.venge.monotone.automate_show_conflict
Deleted entries:
cmd_merging.hh
Renamed entries:
tests/automate_show_conflicts to tests/automate_show_conflicts_options
Modified files:
automate.cc cmd_merging.cc monotone.texi
tests/automate_show_conflicts_options/__driver__.lua
ChangeLog:
Rearrange automate show conflicts code for simplicity
* automate.cc (show_conflicts): Move to cmd_merging.cc, for simpler
sharing of common code.
* cmd_merging.cc (show_conflicts_core, show_conflicts): Move automate
show_conflicts here.
* cmd_merging.hh: Removed; no longer needed.
* monotone.texi (Automation show_conflicts): Add rationale for outputing
file ids.
* tests/automate_show_conflicts: renamed to automate_show_conflicts_options
txtQdzgs5HGAv.txt
Description: Diff [5c7d3a8c99168c3ccadb0a268a49b14cb5e7725f] -> [7133f78685d0bf43123fafd6387407ef26f2ef14]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 7133f78685d0bf43123fafd6387407ef26f2ef14,
monotone <=