Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-default-push.out @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | 6dbb8ae0a0b3 |
children |
line wrap: on
line source
adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % push should push to default when default-push not set pushing searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files % push should push to default-push when set pushing searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files