##// END OF EJS Templates
abort when merging two heads and repository has local changes
abort when merging two heads and repository has local changes

File last commit:

r1487:2bc6cd62 default
r1581:db10b711 default
Show More
test-revert.out
24 lines | 338 B | text/plain | TextLexer
Benoit Boissinot
fix handling of files of unsupported type in the walk code...
r1487 %% should show b unknown
Benoit Boissinot
revert added and removed files to their normal state before reverting...
r1447 ? b
Benoit Boissinot
fix handling of files of unsupported type in the walk code...
r1487 %% should show b unknown and c modified
Benoit Boissinot
revert added and removed files to their normal state before reverting...
r1447 M c
? b
Benoit Boissinot
fix handling of files of unsupported type in the walk code...
r1487 %% should show b added and c modified
Benoit Boissinot
revert added and removed files to their normal state before reverting...
r1447 M c
A b
Benoit Boissinot
fix handling of files of unsupported type in the walk code...
r1487 %% should show a removed, b added and c modified
Benoit Boissinot
revert added and removed files to their normal state before reverting...
r1447 M c
A b
R a
Benoit Boissinot
fix handling of files of unsupported type in the walk code...
r1487 %% should show b added and c modified
Benoit Boissinot
revert added and removed files to their normal state before reverting...
r1447 M c
A b
Benoit Boissinot
fix handling of files of unsupported type in the walk code...
r1487 %% should show b unknown and c modified
Benoit Boissinot
revert added and removed files to their normal state before reverting...
r1447 M c
? b
Benoit Boissinot
fix handling of files of unsupported type in the walk code...
r1487 %% should show b unknown
Benoit Boissinot
revert added and removed files to their normal state before reverting...
r1447 ? b
Benoit Boissinot
fix handling of files of unsupported type in the walk code...
r1487 %% should show a b and c
Benoit Boissinot
revert added and removed files to their normal state before reverting...
r1447 a
b
c