Patchwork [2,of,4] import: reword no hunks partial note

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 22, 2015, 6:15 a.m.
Message ID <2f3879cfb2e943c3ca72.1450764953@waste.org>
Download mbox | patch
Permalink /patch/12232/
State Accepted
Headers show

Comments

timeless@mozdev.org - Dec. 22, 2015, 6:15 a.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1450764190 0
#      Tue Dec 22 06:03:10 2015 +0000
# Node ID 2f3879cfb2e943c3ca72566602c5ded9925ccbde
# Parent  8f6f1280708fb05095d63cfd0b96779de68b6f30
import: reword no hunks partial note

Split Note into a note container

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4607,9 +4607,12 @@ 
     by hand before :hg:`commit --amend` is run to update the created
     changeset. This flag exists to let people import patches that
     partially apply without losing the associated metadata (author,
-    date, description, ...). Note that when none of the hunk applies
-    cleanly, :hg:`import --partial` will create an empty changeset,
-    importing only the patch metadata.
+    date, description, ...).
+
+    .. note::
+
+       When no hunks apply cleanly, :hg:`import --partial` will create
+       an empty changeset, importing only the patch metadata.
 
     With -s/--similarity, hg will attempt to discover renames and
     copies in the patch in the same way as :hg:`addremove`.