comparison docs/evolve-faq.rst @ 347:631cdf4295bc

docs: improve recent updates

346:f4302a2079f4

you can use amend -c to collapse multiple changeset in a single one.

Getting changes out of a commit
------------------------------------------------------------

the ``hg uncommit`` commands allow you to rewrite the current commit to not
include change for some file. The content of target files are not altered on
disk and back as "modified"::

  $ hg st
  M babar
  M celestine
  $ hg commit babar celestine

  M celestine

Split a changeset
-----------------------

I you just want to split whole file, you can just use the ``uncommit`` command.


If you need fine grained split, there is no official command for that yet.
However is it easily achieved by manual operation::

  ### you want to split changeset A: 42
  # update to A parent
  $ hg up 42^
  # restore content from A

marker.

Export to mq: ``synchronize``
------------------------------------------------------------

Another extension allows to export. you changes to mq

View diff from the last amend
------------------------------------------------------------

An ``odiff`` alias have been added by ``enable.sh``

View change to your file
------------------------------------------------------------

Extinct changesets are hidden using the *hidden* feature of mercurial.

Only ``hg log`` and ``hgview`` support it. ``hg glog`` Only support that since
2.2. Other visual viewer don't.

347:631cdf4295bc

you can use amend -c to collapse multiple changeset in a single one.

Getting changes out of a commit
------------------------------------------------------------

The ``hg uncommit`` command lets you rewrite the parent commit without
selected changed files. Target files content is not altered and
appears again as "modified"::

  $ hg st
  M babar
  M celestine
  $ hg commit babar celestine

  M celestine

Split a changeset
-----------------------

To split on file boundaries, just use ``uncommit`` command.

There is no official command yet to split at a finer granularity. One
way to achieve this is::

  ### you want to split changeset A: 42
  # update to A parent
  $ hg up 42^
  # restore content from A

marker.

Export to mq: ``synchronize``
------------------------------------------------------------

Another extension lets you export your changes to mq.

View diff from the last amend
------------------------------------------------------------

An ``odiff`` alias have been added by ``enable.sh``

View change to your file
------------------------------------------------------------

Extinct changesets are hidden using the *hidden* feature of mercurial.

Only ``hg log``, ``hg glog`` and ``hgview`` support it, other
graphical viewer do not.