Mercurial > hg
view tests/test-rename-dir-merge2.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.
author | Jim Hague <jim.hague@acm.org> |
---|---|
date | Thu, 04 Dec 2008 13:42:47 +0000 |
parents | 0750f11152fe |
children | a3d73b3e1f8a |
line wrap: on
line source
adding a/f updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved moving a/f to b/f adding a/aa/g pulling from ../r2 searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) 2 files updated, 0 files merged, 1 files removed, 0 files unresolved (branch merge, don't forget to commit) M b/f A b/aa/g a/aa/g R a/aa/g R a/f