Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-dispatch.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 | e0e73ba37983 |
children |
line wrap: on
line source
adding a # missing arg hg cat: invalid arguments hg cat [OPTION]... FILE... output the current or given revision of files Print the specified files as they were at the given revision. If no revision is given, the parent of the working directory is used, or tip if no revision is checked out. Output may be to a file, in which case the name of the file is given using a format string. The formatting rules are the same as for the export command, with the following additions: %s basename of file being printed %d dirname of file being printed, or '.' if in repo root %p root-relative path name of file being printed options: -o --output print output to file with formatted name -r --rev print the given revision -I --include include names matching the given patterns -X --exclude exclude names matching the given patterns use "hg -v help cat" to show global options % [defaults] a a % no repo abort: There is no Mercurial repository here (.hg not found)!