hg, git, fossil, ...

[Tim Delaney]

On 29 August 2014 02:32, Tim Chase <python.list at tim.thechases.com> wrote:

>
> No, you wouldn't use "hg pull" nor "git pull" but rather "git
> cherry-pick" or what Mercurial calls "transplant" (I've not used this
> in Mercurial, but I believe it's an extension).
>

hg transplant has been deprecated for a long time now. The correct command
for cherry-picking is hg graft.

I do sometimes miss the ability to easily cherry-pick the changes in a
single file. When grafting, you graft the entire revision, and then need to
revert individual files and amend the changeset if you don't want the graft
as-is. It's a bit messy, and could cause problems if you later do a merge
that includes the originally-grafted changeset on top of the amended
changeset (since the changes committed to the amended changeset will be
considered during the merge).

Tim Delaney
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/python-list/attachments/20140829/4607adba/attachment.html>