##// END OF EJS Templates
revert: option to choose what to keep, not what to discard...
revert: option to choose what to keep, not what to discard I know the you (the reader) are probably tired of discussing how `hg revert -i -r .` should behave and so am I. And I know I'm one of the people who argued that showing the diff from the working copy to the parent was confusing. I think it is less confusing now that we show the diff from the parent to the working copy, but I still find it confusing. I think showing the diff of hunks to keep might make it easier to understand. So that's what this patch provides an option for. One argument doing it this way is that most people seem to find `hg split` natural. I suspect that is because it shows the forward diff (from parent commit to the commit) and asks you what to put in the first commit. I think the new "keep" mode for revert (this patch) matches that. In "keep" mode, all the changes are still selected by default. That means that `hg revert -i` followed by 'A' (keep all) (or 'c' in curses) will be different from `hg revert -a`. That's mostly because that was simplest. It can also be argued that it's safest. But it can also be argued that it should be consistent with `hg revert -a`. Note that in this mode, you can edit the hunks and it will do what you expect (e.g. add new lines to your file if you added a new lines when editing). The test case shows that that works. Differential Revision: https://phab.mercurial-scm.org/D6125
Martin von Zweigbergk -
r42154:c1d83d91 default
Show More
Name Size Modified Last Commit Author
/ contrib / win32
ReadMe.html Loading ...
buildlocal.bat Loading ...
hg.bat Loading ...
hgwebdir_wsgi.py Loading ...
mercurial.ico Loading ...
mercurial.ini Loading ...
postinstall.txt Loading ...


<html>
<head>
<title>Mercurial for Windows</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" >
<style type="text/css">

</style>
</head>

<body>

Mercurial for Windows



Welcome to Mercurial for Windows!




Mercurial is a command-line application. You must run it from
the Windows command prompt (or if you're hard core, a <a<br /> href="http://www.mingw.org/">MinGW shell).




Note: the standard http://www.mingw.org/">MinGW
msys startup script uses rxvt which has problems setting up
standard input and output. Running bash directly works
correctly.




For documentation, please visit the <a<br /> href="https://mercurial-scm.org/">Mercurial web site.
You can also download a free book, <a<br /> href="https://book.mercurial-scm.org/">Mercurial: The Definitive
Guide.




By default, Mercurial installs to C:\Program
Files\Mercurial
. The Mercurial command is called
hg.exe.



Testing Mercurial after you've installed it




The easiest way to check that Mercurial is installed properly is
to just type the following at the command prompt:




hg



This command should print a useful help message. If it does,
other Mercurial commands should work fine for you.



Configuration notes


Default editor



The default editor for commit messages is 'notepad'. You can set
the EDITOR (or HGEDITOR) environment variable
to specify your preference or set it in mercurial.ini:



[ui]
editor = whatever


Configuring a Merge program



It should be emphasized that Mercurial by itself doesn't attempt
to do a Merge at the file level, neither does it make any
attempt to Resolve the conflicts.




By default, Mercurial will use the merge program defined by the
HGMERGE environment variable, or uses the one defined
in the mercurial.ini file. (see <a<br /> href="https://mercurial-scm.org/wiki/MergeProgram">MergeProgram
on the Mercurial Wiki for more information)



Reporting problems




Before you report any problems, please consult the <a<br /> href="https://mercurial-scm.org/">Mercurial web site
and see if your question is already in our list of <a<br /> href="https://mercurial-scm.org/wiki/FAQ">Frequently
Answered Questions (the "FAQ").




If you cannot find an answer to your question, please feel free
to send mail to the Mercurial mailing list, at <a<br /> href="mailto:mercurial@mercurial-scm.org">mercurial@mercurial-scm.org.
Remember, the more useful information you include in your
report, the easier it will be for us to help you!




If you are IRC-savvy, that's usually the fastest way to get
help. Go to #mercurial on irc.freenode.net.



Author and copyright information




Mercurial was written by http://www.selenic.com">Matt
Mackall, and is maintained by Matt and a team of volunteers.




The Windows installer was written by <a<br /> href="http://www.serpentine.com/blog">Bryan O'Sullivan.




Mercurial is Copyright 2005-2019 Matt Mackall and others. See
the Contributors.txt file for a list of contributors.




Mercurial is free software; you can redistribute it and/or
modify it under the terms of the <a<br /> href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU
General Public License version 2 or any later version.




Mercurial is distributed in the hope that it will be useful, but
without any warranty; without even the implied warranty
of merchantability or fitness for a particular
purpose
. See the GNU General Public License for more
details.


</body>
</html>