Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-unrelated-pull.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 | 8c4fd0de5de8 |
children |
line wrap: on
line source
pulling from ../a searching for changes abort: repository is unrelated pulling from ../a searching for changes warning: repository is unrelated 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) changeset: 1:bdcee5d51fa6 tag: tip parent: -1:000000000000 user: a date: Mon Jan 12 13:46:40 1970 +0000 summary: a changeset: 0:f155ba1aa5ba user: b date: Mon Jan 12 13:46:40 1970 +0000 summary: b