Mercurial > hg
view doc/hg.1.txt @ 9717:68a1b9d0663e
update: allow branch crossing without -c or -C, with no uncommitted changes
Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches. Minor change to abort message if
uncommitted changes are found.
Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | 563a9c3a7d2e |
children | dd1a95ccbe07 |
line wrap: on
line source
==== hg ==== --------------------------------------- Mercurial source code management system --------------------------------------- :Author: Matt Mackall <mpm@selenic.com> :Organization: Mercurial :Manual section: 1 :Manual group: Mercurial Manual .. contents:: :backlinks: top :class: htmlonly SYNOPSIS -------- **hg** *command* [*option*]... [*argument*]... DESCRIPTION ----------- The **hg** command provides a command line interface to the Mercurial system. COMMAND ELEMENTS ---------------- files... indicates one or more filename or relative path filenames; see `File Name Patterns`_ for information on pattern matching path indicates a path on the local machine revision indicates a changeset which can be specified as a changeset revision number, a tag, or a unique substring of the changeset hash value repository path either the pathname of a local repository or the URI of a remote repository. .. include:: hg.1.gendoc.txt FILES ----- ``.hgignore`` This file contains regular expressions (one per line) that describe file names that should be ignored by **hg**. For details, see |hgignore(5)|_. ``.hgtags`` This file contains changeset hash values and text tag names (one of each separated by spaces) that correspond to tagged versions of the repository contents. ``/etc/mercurial/hgrc``, ``$HOME/.hgrc``, ``.hg/hgrc`` This file contains defaults and configuration. Values in ``.hg/hgrc`` override those in ``$HOME/.hgrc``, and these override settings made in the global ``/etc/mercurial/hgrc`` configuration. See |hgrc(5)|_ for details of the contents and format of these files. Some commands (e.g. revert) produce backup files ending in ``.orig``, if the ``.orig`` file already exists and is not tracked by Mercurial, it will be overwritten. BUGS ---- Probably lots, please post them to the mailing list (see Resources_ below) when you find them. SEE ALSO -------- |hgignore(5)|_, |hgrc(5)|_ AUTHOR ------ Written by Matt Mackall <mpm@selenic.com> RESOURCES --------- Main Web Site: http://mercurial.selenic.com/ Source code repository: http://selenic.com/hg Mailing list: http://selenic.com/mailman/listinfo/mercurial COPYING ------- Copyright (C) 2005-2009 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2. .. include:: common.txt