view tests/test-merge-types.out @ 8902:b9a8b616521d

Add a forget command for easily untracking files.

This command does exactly what 'hg remove -Af [FILES]' does.

The reason for creating a new command is that the options for 'hg remove'
are confusing (-A removes only deleted files, -f forces deletion, and using
both means *the exact opposite of both*).

[mpm: simplified help text, code, and updated tests]

adding a
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
  searching for copies back to rev 1
resolving manifests
 overwrite None partial False
 ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
 conflicting flags for a
(n)one, e(x)ec or sym(l)ink? n
 a: update permissions -> e
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% symlink is local parent, executable is other
a has no flags (default for conflicts)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  searching for copies back to rev 1
resolving manifests
 overwrite None partial False
 ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
 conflicting flags for a
(n)one, e(x)ec or sym(l)ink? n
 a: remote is newer -> g
getting a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% symlink is other parent, executable is local
a has no flags (default for conflicts)