Mercurial Mercurial > hg > mercurial-crew-with-dirclash / changelog
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | gz | help
(0) -3000 -1000 -300 -100 -30 -10 -3 tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sat, 27 Oct 2007 16:27:55 +0400 Fix file-changed-to-dir and dir-to-file commits (issue660). default tip
changeset
Maxim Dounin <mdounin@mdounin.ru> [Sat, 27 Oct 2007 16:27:55 +0400] rev 5483
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.
Fri, 26 Oct 2007 16:43:13 -0700 See if execute bit is honoured when we go back in time
changeset
Bryan O'Sullivan <bos@serpentine.com> [Fri, 26 Oct 2007 16:43:13 -0700] rev 5482
See if execute bit is honoured when we go back in time
Fri, 26 Oct 2007 12:37:59 +0200 merge with -stable
changeset
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 26 Oct 2007 12:37:59 +0200] rev 5481
merge with -stable
(0) -3000 -1000 -300 -100 -30 -10 -3 tip
mercurial-crew-with-dirclash