[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 29695caf601513d13b2ca98d769dfbba2eaa
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 29695caf601513d13b2ca98d769dfbba2eaa6d1e |
Date: |
Sat, 10 Feb 2007 08:05:00 +0100 |
-----------------------------------------------------------------
Revision: 29695caf601513d13b2ca98d769dfbba2eaa6d1e
Ancestor: 2f8055d19ce879bc25b10e47ee6d98ff8cbb3556
Ancestor: 50767bcca4a3c0c1dbb8379d14ec3c8560c16239
Author: address@hidden
Date: 2007-02-10T04:46:50
Branch: net.venge.monotone.workspace-merge.noconflict
Deleted entries:
localized_file_io.cc localized_file_io.hh
tests/files_with_non-utf8_data
tests/files_with_non-utf8_data/8859-5.lua
tests/files_with_non-utf8_data/__driver__.lua
tests/files_with_non-utf8_data/euc.lua
tests/files_with_non-utf8_data/jp-euc
tests/files_with_non-utf8_data/jp-utf8
tests/files_with_non-utf8_data/ru-8859-5
tests/files_with_non-utf8_data/ru-utf8
tests/use_get_linesep_conv_hook
tests/use_get_linesep_conv_hook/__driver__.lua
tests/use_get_linesep_conv_hook/linesep.lua
Renamed entries:
tests/checkout_clobbers_workspace to
tests/checkout_does_not_clobber_workspace
tests/update_clobbers_workspace to
tests/update_does_not_clobber_workspace
tests/workspace_migration/test-1 to tests/workspace_migration/basic-1
tests/workspace_migration/test-2 to tests/workspace_migration/basic-2
Added files:
tests/locked_workspace/__driver__.lua
tests/merge_into_workspace/__driver__.lua
tests/merge_into_workspace/dont_merge
tests/merge_into_workspace/expected-log
tests/merge_into_workspace/expected-log-left
tests/merge_into_workspace/expected-manifest
tests/merge_into_workspace/left
tests/merge_into_workspace/merged
tests/merge_into_workspace/otherfile
tests/merge_into_workspace/otherfile_mod
tests/merge_into_workspace/right
tests/merge_into_workspace/testfile
tests/merge_into_workspace_attr_corpse/__driver__.lua
tests/merge_into_workspace_attr_corpse/expected-roster
tests/merge_into_workspace_attr_corpse/testfile
tests/merge_into_workspace_files_added/__driver__.lua
tests/merge_into_workspace_files_added/expected-revision
tests/merge_into_workspace_files_added/left
tests/merge_into_workspace_files_added/right
tests/merge_into_workspace_files_added/testfile
tests/merge_into_workspace_no_changes/__driver__.lua
tests/merge_into_workspace_no_changes/left
tests/merge_into_workspace_no_changes/right
tests/merge_into_workspace_no_changes/testfile
tests/merge_into_workspace_no_changes/unrelated
tests/merge_into_workspace_same_rev/__driver__.lua
tests/pluck_does_not_clobber_workspace/__driver__.lua
tests/revert_the_middle_of_a_sequence/__driver__.lua
tests/two_parent_workspace_add_drop_rename/__driver__.lua
tests/two_parent_workspace_annotate/__driver__.lua
tests/two_parent_workspace_annotate/expected-annotation
tests/two_parent_workspace_annotate/left
tests/two_parent_workspace_annotate/merged
tests/two_parent_workspace_annotate/right
tests/two_parent_workspace_annotate/testfile
tests/two_parent_workspace_attrs/__driver__.lua
tests/two_parent_workspace_commands_that_fail/__driver__.lua
tests/two_parent_workspace_inodeprints/__driver__.lua
tests/two_parent_workspace_list/__driver__.lua
tests/two_parent_workspace_pivot_root/__driver__.lua
tests/two_parent_workspace_pluck/__driver__.lua
tests/workspace_migration/basic.lua
tests/workspace_migration/inodeprints-1/_MTN/inodeprints
tests/workspace_migration/inodeprints-1/_MTN/log
tests/workspace_migration/inodeprints-1/_MTN/monotonerc
tests/workspace_migration/inodeprints-1/_MTN/options
tests/workspace_migration/inodeprints-1/_MTN/revision
tests/workspace_migration/inodeprints-1/_MTN/work
tests/workspace_migration/inodeprints-1/newdir/file3
tests/workspace_migration/inodeprints-1/renamed-testfile2
tests/workspace_migration/inodeprints-1/testfile1
tests/workspace_migration/inodeprints-2/_MTN/format
tests/workspace_migration/inodeprints-2/_MTN/inodeprints
tests/workspace_migration/inodeprints-2/_MTN/log
tests/workspace_migration/inodeprints-2/_MTN/monotonerc
tests/workspace_migration/inodeprints-2/_MTN/options
tests/workspace_migration/inodeprints-2/_MTN/revision
tests/workspace_migration/inodeprints-2/newdir/file3
tests/workspace_migration/inodeprints-2/renamed-testfile2
tests/workspace_migration/inodeprints-2/testfile1
tests/workspace_migration/inodeprints.lua
tests/workspace_migration/twoparent-2/_MTN/format
tests/workspace_migration/twoparent-2/_MTN/log
tests/workspace_migration/twoparent-2/_MTN/monotonerc
tests/workspace_migration/twoparent-2/_MTN/options
tests/workspace_migration/twoparent-2/_MTN/revision
tests/workspace_migration/twoparent-2/attrfile
tests/workspace_migration/twoparent-2/testfile
tests/workspace_migration/twoparent.lua
Added directories:
tests/locked_workspace tests/merge_into_workspace
tests/merge_into_workspace_attr_corpse
tests/merge_into_workspace_files_added
tests/merge_into_workspace_no_changes
tests/merge_into_workspace_same_rev
tests/pluck_does_not_clobber_workspace
tests/revert_the_middle_of_a_sequence
tests/two_parent_workspace_add_drop_rename
tests/two_parent_workspace_annotate
tests/two_parent_workspace_attrs
tests/two_parent_workspace_commands_that_fail
tests/two_parent_workspace_inodeprints
tests/two_parent_workspace_list
tests/two_parent_workspace_pivot_root
tests/two_parent_workspace_pluck
tests/workspace_migration/inodeprints-1
tests/workspace_migration/inodeprints-1/_MTN
tests/workspace_migration/inodeprints-1/newdir
tests/workspace_migration/inodeprints-2
tests/workspace_migration/inodeprints-2/_MTN
tests/workspace_migration/inodeprints-2/newdir
tests/workspace_migration/twoparent-2
tests/workspace_migration/twoparent-2/_MTN
Modified files:
ChangeLog Makefile.am NEWS automate.cc cert.cc cert.hh
cmd_diff_log.cc cmd_files.cc cmd_list.cc cmd_merging.cc
cmd_ws_commit.cc commands.cc configure.ac database.hh
database_check.cc diff_patch.cc diff_patch.hh file_io.cc
file_io.hh lua_hooks.cc lua_hooks.hh monotone.texi netio.hh
po/it.po restrictions.cc restrictions.hh revision.cc
revision.hh roster.cc roster.hh roster_merge.cc
simplestring_xform.cc simplestring_xform.hh
tests/checkout_does_not_clobber_workspace/__driver__.lua
tests/ls_unknown_in_subdir/__driver__.lua
tests/restrictions_with_renames_and_adds/__driver__.lua
tests/test_a_merge_8/correct tests/test_a_merge_8/left
tests/test_a_merge_8/parent tests/test_a_merge_8/right
tests/workspace_migration/__driver__.lua testsuite.lua
vocab_macros.hh win32/fs.cc work.cc work.hh
ChangeLog:
propagate from branch 'net.venge.monotone' (head
2f8055d19ce879bc25b10e47ee6d98ff8cbb3556)
to branch 'net.venge.monotone.workspace-merge.noconflict' (head
50767bcca4a3c0c1dbb8379d14ec3c8560c16239)
monotone --db={your.database} diff
--revision=2f8055d19ce879bc25b10e47ee6d98ff8cbb3556
--revision=29695caf601513d13b2ca98d769dfbba2eaa6d1e
monotone --db={your.database} diff
--revision=50767bcca4a3c0c1dbb8379d14ec3c8560c16239
--revision=29695caf601513d13b2ca98d769dfbba2eaa6d1e
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 29695caf601513d13b2ca98d769dfbba2eaa6d1e,
monotone <=