[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 9ca277d48bcc390f05ed16ecf88700578b2628
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 9ca277d48bcc390f05ed16ecf88700578b262879 |
Date: |
Sun, 11 Feb 2007 20:05:04 +0100 |
-----------------------------------------------------------------
Revision: 9ca277d48bcc390f05ed16ecf88700578b262879
Ancestor: 1939aa95a48975fd7410132cc663e03132076e37
Ancestor: 96ed05f006bf96d99ae730378cec88cf3631f072
Author: Thomas Moschny <address@hidden>
Date: 2007-02-11T18:43:49
Branch: net.venge.monotone.experiment.annotate.roster_deltas
Renamed entries:
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/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/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_inodeprint_from_birth/__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/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/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_inodeprint_from_birth
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:
annotate.cc automate.cc cert.cc cert.hh cmd_diff_log.cc
cmd_files.cc cmd_list.cc cmd_merging.cc cmd_ws_commit.cc
database.cc database.hh database_check.cc monotone.texi
po/de.po project.cc project.hh restrictions.cc
restrictions.hh rev_height.cc rev_height.hh revision.cc
revision.hh roster.cc roster.hh roster_delta.cc
roster_delta.hh roster_merge.cc schema_migration.cc
std_hooks.lua tester.cc tests/common/cvs.lua
tests/empty_environment/__driver__.lua
tests/fail_cleanly_on_unreadable__MTN_options/__driver__.lua
tests/fail_cleanly_on_unreadable_db/__driver__.lua
tests/restrictions_with_renames_and_adds/__driver__.lua
tests/workspace_migration/__driver__.lua testsuite.lua
unix/fs.cc work.cc work.hh
ChangeLog:
propagate from branch 'net.venge.monotone' (head
96ed05f006bf96d99ae730378cec88cf3631f072)
to branch 'net.venge.monotone.experiment.annotate.roster_deltas'
(head 1939aa95a48975fd7410132cc663e03132076e37)
monotone --db={your.database} diff
--revision=1939aa95a48975fd7410132cc663e03132076e37
--revision=9ca277d48bcc390f05ed16ecf88700578b262879
monotone --db={your.database} diff
--revision=96ed05f006bf96d99ae730378cec88cf3631f072
--revision=9ca277d48bcc390f05ed16ecf88700578b262879
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 9ca277d48bcc390f05ed16ecf88700578b262879,
monotone <=