Mercurial > hg
view tests/test-rename-after-merge.out @ 6997:9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
If we can't create the unix socket because the path is too long
we create the socket in a temporary directory and symlink it into
the repo.
Fix issue1208
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 06 Sep 2008 14:11:33 +0200 |
parents | 0750f11152fe |
children | d821ea464465 |
line wrap: on
line source
% create source repository adding a % fork source repository updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b % update source repository % merge repositories pulling from ../t2 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) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) M b % rename b as c A c R b % rename back c as b M b