##// END OF EJS Templates
commit: when committing the results of a merge, it's all or nothing...
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.

File last commit:

r6258:c24f4b3f default
r6385:0d4e068e default
Show More
test-symlink-basic.out
31 lines | 677 B | text/plain | TextLexer
/ tests / test-symlink-basic.out
abort: file dangling not tracked!
changeset: 0:cabd88b706fc
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
files: dangling
description:
add symlink
2564acbe54bbbedfbf608479340b359f04597f80 644 @ dangling
% rev 0:
dangling -> nothing
% rev 1:
dangling -> void
% modifying link
dangling -> empty
% reverting to rev 0:
reverting dangling
dangling -> nothing
% backups:
dangling.orig -> empty
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% copies
copying dangling to dangling2
A dangling2
dangling
dangling -> void
dangling2 -> void
% issue995
0 files updated, 0 files merged, 1 files removed, 0 files unresolved