[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision e9428d616a7169946b2d9e57541b38c0ec24f2
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision e9428d616a7169946b2d9e57541b38c0ec24f210 |
Date: |
Sun, 8 Feb 2009 21:47:10 +0100 |
-----------------------------------------------------------------
Revision: e9428d616a7169946b2d9e57541b38c0ec24f210
Ancestor: 07b58d2bb24260d225e7a90785dd5b9f4e02d1f6
Ancestor: 330226908bd09cd9ec30104cc1c3724dd1c64c75
Author: address@hidden
Date: 2009-02-08T05:17:47
Branch: net.venge.monotone
Renamed entries:
diff_patch.cc to diff_output.cc
diff_patch.hh to diff_output.hh
merge.cc to merge_content.cc
merge.hh to merge_content.hh
roster_merge.cc to merge_roster.cc
roster_merge.hh to merge_roster.hh
schema_migration.cc to migrate_schema.cc
schema_migration.hh to migration.hh
work_migration.cc to migrate_work.cc
Added files:
ancestry.cc cmd.cc merge_3way.cc merge_conflict.cc
migrate_ancestry.cc roster_tests.hh
Modified files:
Makefile.am app_state.cc app_state.hh automate.cc cert.cc
cert.hh cmd.hh cmd_conflicts.cc cmd_db.cc cmd_diff_log.cc
cmd_files.cc cmd_list.cc cmd_merging.cc cmd_netsync.cc
cmd_packet.cc cmd_ws_commit.cc commands.cc crypto_tests.cc
database.cc database.hh diff_output.cc diff_output.hh
interner.hh key_store.cc key_store.hh keys.cc keys.hh
lua_hooks.cc merge_content.cc merge_content.hh
merge_roster.cc merge_roster.hh migrate_schema.cc
migrate_work.cc migration.hh monotone.cc mt_version.cc
netsync.cc option.cc option.hh packet.cc packet.hh paths.cc
paths.hh po/POTFILES.in project.cc project.hh
restrictions.cc restrictions.hh rev_types.hh revision.cc
revision.hh roster.cc roster.hh roster_delta.cc
roster_delta.hh sanity.cc sanity.hh tester.cc transforms.cc
ui.cc ui.hh unit_tests.cc work.cc work.hh xdelta.cc
ChangeLog:
merge of '07b58d2bb24260d225e7a90785dd5b9f4e02d1f6'
and '330226908bd09cd9ec30104cc1c3724dd1c64c75'
monotone --db={your.database} diff
--revision=07b58d2bb24260d225e7a90785dd5b9f4e02d1f6
--revision=e9428d616a7169946b2d9e57541b38c0ec24f210
monotone --db={your.database} diff
--revision=330226908bd09cd9ec30104cc1c3724dd1c64c75
--revision=e9428d616a7169946b2d9e57541b38c0ec24f210
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision e9428d616a7169946b2d9e57541b38c0ec24f210,
monotone <=