chrome-dev-tools-patches/doc
author Eugene Ostroukhov <eugeneo@symbian.org>
Thu, 13 May 2010 15:47:02 -0700
changeset 333 895153411a80
parent 319 40387cc658b4
permissions -rw-r--r--
Bug 2647 - phonegap example : storage preview support
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
319
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     1
hg import [OPTION]... PATCH...
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     2
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     3
aliases: patch
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     4
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     5
import an ordered set of patches
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     6
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     7
    Import a list of patches and commit them individually (unless --no-commit
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     8
    is specified).
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
     9
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    10
    If there are outstanding changes in the working directory, import will
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    11
    abort unless given the -f/--force flag.
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    12
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    13
    You can import a patch straight from a mail message. Even patches as
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    14
    attachments work (to use the body part, it must have type text/plain or
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    15
    text/x-patch). From and Subject headers of email message are used as
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    16
    default committer and commit message. All text/plain body parts before
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    17
    first diff are added to commit message.
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    18
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    19
    If the imported patch was generated by hg export, user and description
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    20
    from patch override values from message headers and body. Values given on
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    21
    command line with -m/--message and -u/--user override these.
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    22
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    23
    If --exact is specified, import will set the working directory to the
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    24
    parent of each patch before applying it, and will abort if the resulting
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    25
    changeset has a different ID than the one recorded in the patch. This may
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    26
    happen due to character set problems or other deficiencies in the text
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    27
    patch format.
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    28
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    29
    With -s/--similarity, hg will attempt to discover renames and copies in
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    30
    the patch in the same way as 'addremove'.
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    31
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    32
    To read a patch from standard input, use "-" as the patch name. If a URL
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    33
    is specified, the patch will be downloaded from it. See 'hg help dates'
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    34
    for a list of formats valid for -d/--date.
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    35
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    36
options:
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    37
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    38
 -p --strip           directory strip option for patch. This has the same
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    39
                      meaning as the corresponding patch option (default: 1)
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    40
 -b --base            base path
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    41
 -f --force           skip check for outstanding uncommitted changes
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    42
    --no-commit       don't commit, just update the working directory
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    43
    --exact           apply patch to the nodes from which it was generated
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    44
    --import-branch   use any branch information in patch (implied by --exact)
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    45
 -m --message         use <text> as commit message
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    46
 -l --logfile         read commit message from <file>
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    47
 -d --date            record datecode as commit date
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    48
 -u --user            record the specified user as committer
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    49
 -s --similarity      guess renamed files by similarity (0<=s<=100)
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    50
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    51
global options:
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    52
 -R --repository      repository root directory or name of overlay bundle file
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    53
    --cwd             change working directory
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    54
 -y --noninteractive  do not prompt, assume 'yes' for any required answers
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    55
 -q --quiet           suppress output
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    56
 -v --verbose         enable additional output
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    57
    --config          set/override config option
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    58
    --debug           enable debugging output
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    59
    --debugger        start debugger
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    60
    --encoding        set the charset encoding (default: cp1251)
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    61
    --encodingmode    set the charset encoding mode (default: strict)
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    62
    --traceback       always print a traceback on exception
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    63
    --time            time how long the command takes
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    64
    --profile         print command execution profile
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    65
    --version         output version information and exit
40387cc658b4 PhoneGap support work in progress
Eugene Ostroukhov <eugeneo@symbian.org>
parents:
diff changeset
    66
 -h --help            display help and exit