tests/test-hardlinks-safety.out
author Matt Mackall <mpm@selenic.com>
Mon, 08 Jun 2009 18:14:44 -0500
changeset 8746 84c44c9ed555
parent 7627 fb32ae9c76e7
child 8833 14639c050251
permissions -rw-r--r--
merge: combine three identical 'remote is newer' cases

% no diff if hardlink
% init
adding foo to series file
applying foo
now at: foo
adding bar to series file
applying bar
now at: bar
430ed4828a74fa4047bc816a25500f7472ab4bfe:foo
4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c:bar
%
foo
bar
%%%
430ed4828a74fa4047bc816a25500f7472ab4bfe:foo
%
foo
%%%
4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo
430ed4828a74fa4047bc816a25500f7472ab4bfe bar
%
4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo
430ed4828a74fa4047bc816a25500f7472ab4bfe lbar
%%%
4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo
%
4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo