Mercurial > hg > mercurial-crew-with-dirclash
view mercurial/hgweb/__init__.py @ 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 | abaee83ce0a6 |
| children |
line wrap: on
line source
# hgweb/__init__.py - web interface to a mercurial repository # # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> # Copyright 2005 Matt Mackall <mpm@selenic.com> # # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. import hgweb_mod, hgwebdir_mod def hgweb(*args, **kwargs): return hgweb_mod.hgweb(*args, **kwargs) def hgwebdir(*args, **kwargs): return hgwebdir_mod.hgwebdir(*args, **kwargs)