hg, git, fossil, ...

[Mark Lawrence]

On 28/08/2014 22:25, Tim Delaney wrote:
> On 29 August 2014 02:32, Tim Chase <python.list at tim.thechases.com
> <mailto: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
>

Surely a lot of the hassle with version control systems could be avoided 
if people were to write bug free code in the first place? :)

-- 
My fellow Pythonistas, ask not what our language can do for you, ask
what you can do for our language.

Mark Lawrence