view tests/test-merge-types.out @ 10955:470a6ace7574

Added support for 'pretxncommit', so that one can call the ACL hook at
pre-commit time too. This is useful because now it's possible to avoid
violating ACL permissions much sooner, at commit time, instead of
waiting for a PUSH to check if there were any invalid commits.

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
update: a 1/1 files (100.00%)
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
update: a 1/1 files (100.00%)
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)