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

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

[Monotone-commits-diffs] Revision 03616a16ca9c971baf666899eb2c486d18364d


From: monotone
Subject: [Monotone-commits-diffs] Revision 03616a16ca9c971baf666899eb2c486d18364d7e
Date: Wed, 10 Sep 2008 07:13:20 +0200

-----------------------------------------------------------------
Revision: 03616a16ca9c971baf666899eb2c486d18364d7e
Ancestor: 26b67ca9897af899fe9da44945f9479ba5fba8c8
Ancestor: 490e2bd9ae9a28684f56a09e92ade06f495ad3e2
Author: address@hidden
Date: 2008-09-07T10:27:15
Branch: net.venge.monotone.resolve_conflicts

Deleted entries:
        smap.hh
Added files:
        cmd_conflicts.cc tests/automate_file_merge/__driver__.lua
        tests/resolve_conflict_all_resolutions/__driver__.lua
        tests/resolve_conflict_all_resolutions/conflicts-1
        tests/resolve_conflict_all_resolutions/conflicts-resolved
        tests/resolve_conflict_all_resolutions/merge-1
        tests/resolve_conflict_all_resolutions/show_first-checkout_left
        tests/resolve_conflict_all_resolutions/show_first-checkout_right
        tests/resolve_conflict_all_resolutions/show_first-thermostat
        tests/resolve_conflict_all_resolutions/show_first-user
        tests/resolve_conflicts_all_merge_commands/__driver__.lua
        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/conflicts-1
        tests/resolve_duplicate_name_conflict/conflicts-resolved
        tests/resolve_duplicate_name_conflict/merge-1
Added directories:
        tests/automate_file_merge
        tests/resolve_conflict_all_resolutions
        tests/resolve_conflicts_all_merge_commands
        tests/resolve_content_conflict
Modified files:
        Makefile.am NEWS UPGRADE app_state.cc app_state.hh
        basic_io.cc basic_io.hh cmd.hh cmd_automate.cc
        cmd_merging.cc configure.ac database.cc database.hh
        debian/changelog diff_patch.cc diff_patch.hh merge.cc
        merge.hh monotone.spec monotone.texi
        notes/release-checklist.txt options_list.hh paths.cc
        paths.hh roster.cc roster.hh roster_merge.cc roster_merge.hh
        testlib.lua
        tests/automate_show_conflicts/expected-content-attached.stdout
        tests/resolve_duplicate_name_conflict/__driver__.lua
        tests/util_mtnopt/__driver__.lua transforms.cc
        visualc/config.h win32/monotone.iss work.cc

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
26b67ca9897af899fe9da44945f9479ba5fba8c8)
            to branch 'net.venge.monotone.resolve_conflicts' (head 
490e2bd9ae9a28684f56a09e92ade06f495ad3e2)


monotone --db={your.database} diff 
--revision=26b67ca9897af899fe9da44945f9479ba5fba8c8 
--revision=03616a16ca9c971baf666899eb2c486d18364d7e
monotone --db={your.database} diff 
--revision=490e2bd9ae9a28684f56a09e92ade06f495ad3e2 
--revision=03616a16ca9c971baf666899eb2c486d18364d7e
----------------------------------------------------------------------




reply via email to

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