monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision 564796fc5b0b72c4ae0775cdac1c7fad02f32c


From: monotone
Subject: [Monotone-commits-diffs] Revision 564796fc5b0b72c4ae0775cdac1c7fad02f32c6d
Date: Tue, 2 Sep 2008 23:21:34 +0200

-----------------------------------------------------------------
Revision: 564796fc5b0b72c4ae0775cdac1c7fad02f32c6d
Ancestor: b8796e95a127055b5c3a2cdf4c3cd715a82e0427
Ancestor: db337bc730cc15eae78f94a423bc460823b07e0a
Author: address@hidden
Date: 2008-09-02T21:19:04
Branch: net.venge.monotone.resolve_conflicts

Deleted entries:
        ROADMAP
Renamed entries:
        util/mtnopt to util/mtnopt.in
Added files:
        tests/automate_file_merge/__driver__.lua
        tests/resolve_conflict_all_resolutions/__driver__.lua
        tests/resolve_conflict_all_resolutions/conflicts-1
        tests/resolve_conflicts_all_merge_commands/__driver__.lua
        tests/resolve_duplicate_name_conflict/conflicts-1
Added directories:
        tests/automate_file_merge
        tests/resolve_conflict_all_resolutions
        tests/resolve_conflicts_all_merge_commands
Modified files:
        Makefile.am NEWS README cmd_merging.cc configure.ac
        debian/changelog debian/control
        debian/monotone-server.postinst monotone.texi
        roster_merge.cc roster_merge.hh
        tests/automate_show_conflicts/expected-content-attached.stdout
        tests/resolve_content_conflict/__driver__.lua
        tests/resolve_content_conflict/conflicts-1
        tests/resolve_content_conflict/merge-1
        tests/resolve_content_conflict/resolve-conflicts-1
        tests/resolve_content_conflict/update-1
        tests/resolve_duplicate_name_conflict/__driver__.lua
        tests/util_mtnopt/__driver__.lua util/mtnopt.in

ChangeLog: 

merge of 'b8796e95a127055b5c3a2cdf4c3cd715a82e0427'
     and 'db337bc730cc15eae78f94a423bc460823b07e0a'


monotone --db={your.database} diff 
--revision=b8796e95a127055b5c3a2cdf4c3cd715a82e0427 
--revision=564796fc5b0b72c4ae0775cdac1c7fad02f32c6d
monotone --db={your.database} diff 
--revision=db337bc730cc15eae78f94a423bc460823b07e0a 
--revision=564796fc5b0b72c4ae0775cdac1c7fad02f32c6d
----------------------------------------------------------------------




reply via email to

[Prev in Thread] Current Thread [Next in Thread]