<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-2">
</head>
<body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; color: rgb(0, 0, 0); font-size: 14px; ">
<div>
<div><font face="Courier"># HG changeset patch</font></div>
<div><font face="Courier"># User Adrian Zgorzałek <adek@fb.com></font></div>
<div><font face="Courier"># Date 1392343535 28800</font></div>
<div><font face="Courier"># Thu Feb 13 18:05:35 2014 -0800</font></div>
<div><font face="Courier"># Node ID 119950eb09d71e031ebaf28d711693e4980916a7</font></div>
<div><font face="Courier"># Parent 0f1ef9e9e904c18f1ac96aef3a0e0d3aa5f1190c</font></div>
<div><font face="Courier">histedit: clarify description of fold command</font></div>
<div><font face="Courier"><br>
</font></div>
<div><font face="Courier">N and (N-1) didn't add any information to description of fold.</font></div>
<div><font face="Courier">More useful is refering to the commit list as it is displayed in editor.</font></div>
<div><font face="Courier"><br>
</font></div>
<div><font face="Courier">diff -r 0f1ef9e9e904 -r 119950eb09d7 hgext/histedit.py</font></div>
<div><font face="Courier">--- a/hgext/histedit.py<span class="Apple-tab-span" style="white-space:pre">
</span>Thu Feb 06 15:56:25 2014 -0800</font></div>
<div><font face="Courier">+++ b/hgext/histedit.py<span class="Apple-tab-span" style="white-space:pre">
</span>Thu Feb 13 18:05:35 2014 -0800</font></div>
<div><font face="Courier">@@ -30,10 +30,12 @@</font></div>
<div><font face="Courier"> </font></div>
<div><font face="Courier"> # Edit history between c561b4e977df and 7c2fd3b9020c</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">+ # Commits are listed from least to most recent</font></div>
<div><font face="Courier">+ #</font></div>
<div><font face="Courier"> # Commands:</font></div>
<div><font face="Courier"> # p, pick = use commit</font></div>
<div><font face="Courier"> # e, edit = use commit, but stop for amending</font></div>
<div><font face="Courier">- # f, fold = use commit, but fold into previous commit (combines N and N-1)</font></div>
<div><font face="Courier">+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)</font></div>
<div><font face="Courier"> # d, drop = remove commit from history</font></div>
<div><font face="Courier"> # m, mess = edit message without changing commit content</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">@@ -49,10 +51,12 @@</font></div>
<div><font face="Courier"> </font></div>
<div><font face="Courier"> # Edit history between c561b4e977df and 7c2fd3b9020c</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">+ # Commits are listed from least to most recent</font></div>
<div><font face="Courier">+ #</font></div>
<div><font face="Courier"> # Commands:</font></div>
<div><font face="Courier"> # p, pick = use commit</font></div>
<div><font face="Courier"> # e, edit = use commit, but stop for amending</font></div>
<div><font face="Courier">- # f, fold = use commit, but fold into previous commit (combines N and N-1)</font></div>
<div><font face="Courier">+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)</font></div>
<div><font face="Courier"> # d, drop = remove commit from history</font></div>
<div><font face="Courier"> # m, mess = edit message without changing commit content</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">@@ -170,10 +174,12 @@</font></div>
<div><font face="Courier"> # i18n: command names and abbreviations must remain untranslated</font></div>
<div><font face="Courier"> editcomment = _("""# Edit history between %s and %s</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">+# Commits are listed from least to most recent</font></div>
<div><font face="Courier">+#</font></div>
<div><font face="Courier"> # Commands:</font></div>
<div><font face="Courier"> # p, pick = use commit</font></div>
<div><font face="Courier"> # e, edit = use commit, but stop for amending</font></div>
<div><font face="Courier">-# f, fold = use commit, but fold into previous commit (combines N and N-1)</font></div>
<div><font face="Courier">+# f, fold = use commit, but fold into previous commit (combines this commit with the one above)</font></div>
<div><font face="Courier"> # d, drop = remove commit from history</font></div>
<div><font face="Courier"> # m, mess = edit message without changing commit content</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">diff -r 0f1ef9e9e904 -r 119950eb09d7 tests/test-histedit-arguments.t</font></div>
<div><font face="Courier">--- a/tests/test-histedit-arguments.t<span class="Apple-tab-span" style="white-space:pre">
</span>Thu Feb 06 15:56:25 2014 -0800</font></div>
<div><font face="Courier">+++ b/tests/test-histedit-arguments.t<span class="Apple-tab-span" style="white-space:pre">
</span>Thu Feb 13 18:05:35 2014 -0800</font></div>
<div><font face="Courier">@@ -51,10 +51,12 @@</font></div>
<div><font face="Courier"> </font></div>
<div><font face="Courier"> # Edit history between eb57da33312f and 08d98a8350f3</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">+ # Commits are listed from least to most recent</font></div>
<div><font face="Courier">+ #</font></div>
<div><font face="Courier"> # Commands:</font></div>
<div><font face="Courier"> # p, pick = use commit</font></div>
<div><font face="Courier"> # e, edit = use commit, but stop for amending</font></div>
<div><font face="Courier">- # f, fold = use commit, but fold into previous commit (combines N and N-1)</font></div>
<div><font face="Courier">+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)</font></div>
<div><font face="Courier"> # d, drop = remove commit from history</font></div>
<div><font face="Courier"> # m, mess = edit message without changing commit content</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">diff -r 0f1ef9e9e904 -r 119950eb09d7 tests/test-histedit-bookmark-motion.t</font></div>
<div><font face="Courier">--- a/tests/test-histedit-bookmark-motion.t<span class="Apple-tab-span" style="white-space:pre">
</span>Thu Feb 06 15:56:25 2014 -0800</font></div>
<div><font face="Courier">+++ b/tests/test-histedit-bookmark-motion.t<span class="Apple-tab-span" style="white-space:pre">
</span>Thu Feb 13 18:05:35 2014 -0800</font></div>
<div><font face="Courier">@@ -67,10 +67,12 @@</font></div>
<div><font face="Courier"> </font></div>
<div><font face="Courier"> # Edit history between d2ae7f538514 and 652413bf663e</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">+ # Commits are listed from least to most recent</font></div>
<div><font face="Courier">+ #</font></div>
<div><font face="Courier"> # Commands:</font></div>
<div><font face="Courier"> # p, pick = use commit</font></div>
<div><font face="Courier"> # e, edit = use commit, but stop for amending</font></div>
<div><font face="Courier">- # f, fold = use commit, but fold into previous commit (combines N and N-1)</font></div>
<div><font face="Courier">+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)</font></div>
<div><font face="Courier"> # d, drop = remove commit from history</font></div>
<div><font face="Courier"> # m, mess = edit message without changing commit content</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">@@ -125,10 +127,12 @@</font></div>
<div><font face="Courier"> </font></div>
<div><font face="Courier"> # Edit history between b346ab9a313d and cacdfd884a93</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">+ # Commits are listed from least to most recent</font></div>
<div><font face="Courier">+ #</font></div>
<div><font face="Courier"> # Commands:</font></div>
<div><font face="Courier"> # p, pick = use commit</font></div>
<div><font face="Courier"> # e, edit = use commit, but stop for amending</font></div>
<div><font face="Courier">- # f, fold = use commit, but fold into previous commit (combines N and N-1)</font></div>
<div><font face="Courier">+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)</font></div>
<div><font face="Courier"> # d, drop = remove commit from history</font></div>
<div><font face="Courier"> # m, mess = edit message without changing commit content</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">diff -r 0f1ef9e9e904 -r 119950eb09d7 tests/test-histedit-commute.t</font></div>
<div><font face="Courier">--- a/tests/test-histedit-commute.t<span class="Apple-tab-span" style="white-space:pre">
</span>Thu Feb 06 15:56:25 2014 -0800</font></div>
<div><font face="Courier">+++ b/tests/test-histedit-commute.t<span class="Apple-tab-span" style="white-space:pre">
</span>Thu Feb 13 18:05:35 2014 -0800</font></div>
<div><font face="Courier">@@ -61,10 +61,12 @@</font></div>
<div><font face="Courier"> </font></div>
<div><font face="Courier"> # Edit history between 177f92b77385 and 652413bf663e</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">+ # Commits are listed from least to most recent</font></div>
<div><font face="Courier">+ #</font></div>
<div><font face="Courier"> # Commands:</font></div>
<div><font face="Courier"> # p, pick = use commit</font></div>
<div><font face="Courier"> # e, edit = use commit, but stop for amending</font></div>
<div><font face="Courier">- # f, fold = use commit, but fold into previous commit (combines N and N-1)</font></div>
<div><font face="Courier">+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)</font></div>
<div><font face="Courier"> # d, drop = remove commit from history</font></div>
<div><font face="Courier"> # m, mess = edit message without changing commit content</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">diff -r 0f1ef9e9e904 -r 119950eb09d7 tests/test-histedit-obsolete.t</font></div>
<div><font face="Courier">--- a/tests/test-histedit-obsolete.t<span class="Apple-tab-span" style="white-space:pre">
</span>Thu Feb 06 15:56:25 2014 -0800</font></div>
<div><font face="Courier">+++ b/tests/test-histedit-obsolete.t<span class="Apple-tab-span" style="white-space:pre">
</span>Thu Feb 13 18:05:35 2014 -0800</font></div>
<div><font face="Courier">@@ -51,10 +51,12 @@</font></div>
<div><font face="Courier"> </font></div>
<div><font face="Courier"> # Edit history between d2ae7f538514 and 652413bf663e</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">+ # Commits are listed from least to most recent</font></div>
<div><font face="Courier">+ #</font></div>
<div><font face="Courier"> # Commands:</font></div>
<div><font face="Courier"> # p, pick = use commit</font></div>
<div><font face="Courier"> # e, edit = use commit, but stop for amending</font></div>
<div><font face="Courier">- # f, fold = use commit, but fold into previous commit (combines N and N-1)</font></div>
<div><font face="Courier">+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)</font></div>
<div><font face="Courier"> # d, drop = remove commit from history</font></div>
<div><font face="Courier"> # m, mess = edit message without changing commit content</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">diff -r 0f1ef9e9e904 -r 119950eb09d7 tests/test-histedit-outgoing.t</font></div>
<div><font face="Courier">--- a/tests/test-histedit-outgoing.t<span class="Apple-tab-span" style="white-space:pre">
</span>Thu Feb 06 15:56:25 2014 -0800</font></div>
<div><font face="Courier">+++ b/tests/test-histedit-outgoing.t<span class="Apple-tab-span" style="white-space:pre">
</span>Thu Feb 13 18:05:35 2014 -0800</font></div>
<div><font face="Courier">@@ -43,10 +43,12 @@</font></div>
<div><font face="Courier"> </font></div>
<div><font face="Courier"> # Edit history between 055a42cdd887 and 652413bf663e</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">+ # Commits are listed from least to most recent</font></div>
<div><font face="Courier">+ #</font></div>
<div><font face="Courier"> # Commands:</font></div>
<div><font face="Courier"> # p, pick = use commit</font></div>
<div><font face="Courier"> # e, edit = use commit, but stop for amending</font></div>
<div><font face="Courier">- # f, fold = use commit, but fold into previous commit (combines N and N-1)</font></div>
<div><font face="Courier">+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)</font></div>
<div><font face="Courier"> # d, drop = remove commit from history</font></div>
<div><font face="Courier"> # m, mess = edit message without changing commit content</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">@@ -72,10 +74,12 @@</font></div>
<div><font face="Courier"> </font></div>
<div><font face="Courier"> # Edit history between 2a4042b45417 and 51281e65ba79</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">+ # Commits are listed from least to most recent</font></div>
<div><font face="Courier">+ #</font></div>
<div><font face="Courier"> # Commands:</font></div>
<div><font face="Courier"> # p, pick = use commit</font></div>
<div><font face="Courier"> # e, edit = use commit, but stop for amending</font></div>
<div><font face="Courier">- # f, fold = use commit, but fold into previous commit (combines N and N-1)</font></div>
<div><font face="Courier">+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)</font></div>
<div><font face="Courier"> # d, drop = remove commit from history</font></div>
<div><font face="Courier"> # m, mess = edit message without changing commit content</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">@@ -93,10 +97,12 @@</font></div>
<div><font face="Courier"> </font></div>
<div><font face="Courier"> # Edit history between f26599ee3441 and f26599ee3441</font></div>
<div><font face="Courier"> #</font></div>
<div><font face="Courier">+ # Commits are listed from least to most recent</font></div>
<div><font face="Courier">+ #</font></div>
<div><font face="Courier"> # Commands:</font></div>
<div><font face="Courier"> # p, pick = use commit</font></div>
<div><font face="Courier"> # e, edit = use commit, but stop for amending</font></div>
<div><font face="Courier">- # f, fold = use commit, but fold into previous commit (combines N and N-1)</font></div>
<div><font face="Courier">+ # f, fold = use commit, but fold into previous commit (combines this commit with the one above)</font></div>
<div><font face="Courier"> # d, drop = remove commit from history</font></div>
<div><font face="Courier"> # m, mess = edit message without changing commit content</font></div>
<div><font face="Courier"> #</font></div>
</div>
<div style="font-family: Calibri, sans-serif; "><br>
</div>
</body>
</html>