1
Download PDF - Monotone
Transcript
Chapter 4: Command Reference left_name left_file_id right_type ancestor_name ancestor_file_id right_name right_file_id 171 "abc" [918f3642b57a5e2dd13ee874e3dc2518a53ab4b4] "renamed file" "bar" [bdf46a521d5f1dd54c31dda15e99ff6b0c80394a] "abc" [bdf46a521d5f1dd54c31dda15e99ff6b0c80394a] File renamed to different names: conflict left_type ancestor_name ancestor_file_id left_name left_file_id right_type ancestor_name ancestor_file_id right_name right_file_id multiple_names "renamed file" "foo" [e80910e54d0bdea1b6d295ada320b87aaf9fdc23] "bar" [e80910e54d0bdea1b6d295ada320b87aaf9fdc23] "renamed file" "foo" [e80910e54d0bdea1b6d295ada320b87aaf9fdc23] "baz" [e80910e54d0bdea1b6d295ada320b87aaf9fdc23] File dropped and modified (and possibly renamed): conflict ancestor_name ancestor_file_id left_type left_rev left_name left_file_id right_type right_name right_file_id dropped_modified "foo" [e80910e54d0bdea1b6d295ada320b87aaf9fdc23] "dropped file" [b0d6953684d49dd6bd345c312d6a0c8fed3078ce] "foo" [420cde699a422f7c3d2c8951c46ddfd546db66c0] "modified file" "baz" [fe6d523f607e2f2fc0f0defad3bda0351a95a337] Here left name, left file id are from left rev, just before the file was dropped. File orphaned and modified (and possibly renamed): conflict ancestor_name ancestor_file_id left_type left_rev left_name left_file_id right_type right_name right_file_id dropped_modified "foo" [e80910e54d0bdea1b6d295ada320b87aaf9fdc23] "orphaned file" [b0d6953684d49dd6bd345c312d6a0c8fed3078ce] "foo" [420cde699a422f7c3d2c8951c46ddfd546db66c0] "modified file" "baz" [fe6d523f607e2f2fc0f0defad3bda0351a95a337]
