view tests/test-merge-force.out @ 7512:0d488f7f321d

Fix test-acl failure on AIX due to read only LOGNAME.

On AIX /etc/profile sets LOGNAME read only. This causes test-acl to
fail when it comes to set LOGNAME in do_push().

Work around this by using env to set LOGNAME and run the command.

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes
resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b