Mercurial > hg
comparison mercurial/cmdutil.py @ 34056:7e9ccb1670e3
amend: rectify comment
Comment was ambiguous as there can be two parents of a changeset in mercurial.
This commit fixes the comment to clarify that the first parent is being
considered.
Test Plan:
ran the test suite
Differential Revision: https://phab.mercurial-scm.org/D595
| author | Saurabh Singh <singhsrb@fb.com> |
|---|---|
| date | Thu, 31 Aug 2017 18:35:39 -0700 |
| parents | ae92e5c0441c |
| children | da13616d1a92 |
comparison
equal
deleted
inserted
replaced
| 34055:ae92e5c0441c | 34056:7e9ccb1670e3 |
|---|---|
| 3067 # | from working dir to go into amending commit | 3067 # | from working dir to go into amending commit |
| 3068 # | (or a workingctx if there were no changes) | 3068 # | (or a workingctx if there were no changes) |
| 3069 # | | 3069 # | |
| 3070 # old o - changeset to amend | 3070 # old o - changeset to amend |
| 3071 # | | 3071 # | |
| 3072 # base o - parent of amending changeset | 3072 # base o - first parent of the changeset to amend |
| 3073 | 3073 |
| 3074 # Update extra dict from amended commit (e.g. to preserve graft | 3074 # Update extra dict from amended commit (e.g. to preserve graft |
| 3075 # source) | 3075 # source) |
| 3076 extra.update(old.extra()) | 3076 extra.update(old.extra()) |
| 3077 | 3077 |