Mercurial > hg
changeset 16004:7d12b2d3a83d stable
merge with i18n
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 27 Jan 2012 18:43:31 -0600 |
parents | fcf66193b186 (diff) 0d898ebb424e (current diff) |
children | 591f258ae630 |
files | |
diffstat | 3 files changed, 21 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/help/config.txt Fri Jan 27 12:25:02 2012 +0400 +++ b/mercurial/help/config.txt Fri Jan 27 18:43:31 2012 -0600 @@ -915,6 +915,21 @@ Optional. Directory or URL to use when pushing if no destination is specified. +``phases`` +"""""""""" + +Specifies default handling of phases. See :hg:'help phases' for more +information about working with phases. + +``publish`` + Controls draft phase behavior when working as a server. When true, + pushed changesets are set to public in both client and server and + pulled or cloned changesets are set to public in the client. + Default: True + +``new-commit`` + Phase of newly-created commits. + Default: draft ``profiling`` """""""""""""
--- a/mercurial/help/phases.txt Fri Jan 27 12:25:02 2012 +0400 +++ b/mercurial/help/phases.txt Fri Jan 27 18:43:31 2012 -0600 @@ -50,8 +50,8 @@ repository to disable publishing in its configuration file:: [phases] - publishing = False - + publish = False + See :hg:`help config` for more information on config files. .. note::
--- a/mercurial/merge.py Fri Jan 27 12:25:02 2012 +0400 +++ b/mercurial/merge.py Fri Jan 27 18:43:31 2012 -0600 @@ -173,6 +173,10 @@ if m and m != a: # changed from a to m return m if n and n != a: # changed from a to n + if n == 'l' or a == 'l': + # can't automatically merge symlink flag change here, let + # filemerge take care of it + return m return n return '' # flag was cleared @@ -359,7 +363,6 @@ updated += 1 else: merged += 1 - util.setflags(repo.wjoin(fd), 'l' in flags, 'x' in flags) if (move and repo.dirstate.normalize(fd) != f and os.path.lexists(repo.wjoin(f))): repo.ui.debug("removing %s\n" % f)