docs/commands.rst
author Pulkit Goyal <7895pulkit@gmail.com>
Mon, 22 Jan 2018 17:54:27 +0530
changeset 3479 4b9fc8c85ee4
parent 2962 3f466d348047
permissions -rw-r--r--
evolvecmd: use the evolvestate object passed as argument in _solveunstable Earlier if get a merge conflict, we used to initialize a new evolvestate object and used to save it. Let's start using the state object which we get in as argument as that will contain more data about the state.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2962
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
     1
-------------------------
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
     2
Evolve Commands Reference
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
     3
-------------------------
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
     4
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
     5
.. highlight:: none
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
     6
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
     7
amend
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
     8
-----
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
     9
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    10
.. hghelp:: amend
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    11
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    12
evolve
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    13
------
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    14
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    15
.. hghelp:: evolve
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    16
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    17
fold
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    18
----
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    19
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    20
.. hghelp:: fold
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    21
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    22
metaedit
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    23
--------
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    24
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    25
.. hghelp:: metaedit
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    26
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    27
next
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    28
----
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    29
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    30
.. hghelp:: next
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    31
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    32
obslog
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    33
------
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    34
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    35
.. hghelp:: obslog
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    36
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    37
pdiff
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    38
-----
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    39
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    40
.. hghelp:: pdiff
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    41
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    42
previous
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    43
--------
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    44
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    45
.. hghelp:: previous
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    46
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    47
prune
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    48
-----
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    49
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    50
.. hghelp:: prune
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    51
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    52
pstatus
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    53
-------
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    54
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    55
.. hghelp:: pstatus
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    56
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    57
split
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    58
-----
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    59
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    60
.. hghelp:: split
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    61
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    62
touch
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    63
-----
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    64
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    65
.. hghelp:: touch
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    66
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    67
uncommit
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    68
--------
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    69
3f466d348047 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org>
parents:
diff changeset
    70
.. hghelp:: uncommit