Mercurial > hg > mercurial-crew-with-dirclash
annotate README @ 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 | 1158d7018052 |
| children |
| rev | line source |
|---|---|
| 3942 | 1 Basic install: |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
2 |
| 3942 | 3 $ make # see install targets |
| 4 $ make install # do a system-wide install | |
| 5 $ hg debuginstall # sanity-check setup | |
| 6 $ hg # see help | |
|
205
d255d99a7cbd
README: integrate some changes from Kevin Smith
mpm@selenic.com
parents:
204
diff
changeset
|
7 |
| 3942 | 8 See http://www.selenic.com/mercurial/ for detailed installation |
| 9 instructions, platform-specific notes, and Mercurial user information. | |
| 327 | 10 |