[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision d7e9c4aee547ad9b42e92b3c5a6908ec4008
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision d7e9c4aee547ad9b42e92b3c5a6908ec4008a9eb |
Date: |
Sun, 11 Feb 2007 04:05:26 +0100 |
-----------------------------------------------------------------
Revision: d7e9c4aee547ad9b42e92b3c5a6908ec4008a9eb
Ancestor: 3326d52bea1e82f85fc39c57f4b0797c27a13337
Ancestor: 4e6f66a6b2741ede91a3956d619f2e835e49db1c
Author: address@hidden
Date: 2007-02-11T03:00:27
Branch: net.venge.monotone
Branch: net.venge.monotone.workspace-merge.noconflict
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:
automate.cc cert.cc cert.hh cmd_diff_log.cc cmd_files.cc
cmd_list.cc cmd_merging.cc cmd_ws_commit.cc database.hh
database_check.cc monotone.texi restrictions.cc
restrictions.hh revision.cc revision.hh roster.cc roster.hh
roster_merge.cc
tests/restrictions_with_renames_and_adds/__driver__.lua
tests/workspace_migration/__driver__.lua work.cc work.hh
ChangeLog:
propagate from branch 'net.venge.monotone' (head
3326d52bea1e82f85fc39c57f4b0797c27a13337)
to branch 'net.venge.monotone.workspace-merge.noconflict' (head
4e6f66a6b2741ede91a3956d619f2e835e49db1c)
monotone --db={your.database} diff
--revision=3326d52bea1e82f85fc39c57f4b0797c27a13337
--revision=d7e9c4aee547ad9b42e92b3c5a6908ec4008a9eb
monotone --db={your.database} diff
--revision=4e6f66a6b2741ede91a3956d619f2e835e49db1c
--revision=d7e9c4aee547ad9b42e92b3c5a6908ec4008a9eb
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision d7e9c4aee547ad9b42e92b3c5a6908ec4008a9eb,
monotone <=