Mercurial > hg
view doc/hg.1.txt @ 13446:1e497df514e2 stable
rollback: clarifies the message about the reverted state (issue2628)
Previously, when rolling back a transaction, some users could be confused
between the level to which the store is rolled back, and the new parents
of the working directory.
$ hg rollback
rolling back to revision 4 (undo commit)
With this change:
$ hg rollback
repository tip rolled back to tip revision 4 (undo commit)
working directory now based on revision 2 and 1
So now the user can realize that the store has been rolled back to an older
tip, but also that the working directory may not on the tip (here we are
rolling back the merge of the heads 2 and 1)
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Thu, 10 Feb 2011 09:03:06 +0100 |
parents | 4f4eddee254d |
children | 05e522d3f186 |
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 :depth: 1 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-2010 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. .. include:: common.txt