[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 965db86576499f55753421b3d298afc29f99
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 965db86576499f55753421b3d298afc29f99a5c7 |
Date: |
Sun, 30 Mar 2008 23:06:02 +0200 |
-----------------------------------------------------------------
Revision: 965db86576499f55753421b3d298afc29f99a5c7
Ancestor: f8dac2d302b4bb8f7d91432b5da53a8aec061410
Author: address@hidden
Date: 2008-03-27T08:57:24
Branch: net.venge.monotone.automate_show_conflict
Added files:
tests/automate_show_conflicts/expected-content-attached.stdout
tests/automate_show_conflicts/expected-content-detached.stdout
Modified files:
roster_merge.cc
tests/automate_show_conflicts/expected-attribute-attached.stdout
tests/automate_show_conflicts/expected-attribute-detached.stdout
ChangeLog:
automate show_conflicts: support file content conflicts
* roster_merge.cc (put_content_conflict): New basic_io output function.
(roster_merge_result::report_attribute_conflicts): Simplify conflict
name.
(roster_merge_result::report_file_content_conflicts): Use
put_content_conflict.
* tests/automate_show_conflicts/expected-attribute-attached.stdout:
Simplify conflict name.
* tests/automate_show_conflicts/expected-attribute-detached.stdout:
Simplify conflict name.
* tests/automate_show_conflicts/expected-content-attached.stdout: New file.
* tests/automate_show_conflicts/expected-content-detached.stdout: New file.
monotone --db={your.database} diff
--revision=f8dac2d302b4bb8f7d91432b5da53a8aec061410
--revision=965db86576499f55753421b3d298afc29f99a5c7
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 965db86576499f55753421b3d298afc29f99a5c7,
monotone <=