tests/test-rebuildstate.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 24 Sep 2007 19:00:11 -0300
changeset 5335 88e931f74e8b
parent 5080 b304c2496f52
child 5082 79373ec3f27d
permissions -rw-r--r--
convert_git: avoid returning two entries for the same file in getchanges This could happen in merge changesets if the merged file was different from both parents.

adding bar
adding foo
% state dump
a 644          0 baz
n 644          0 foo
r   0          0 bar
% status
A baz
R bar
C foo
% state dump
n 666         -1 bar
n 666         -1 foo
% status
! bar
? baz
C foo