Mercurial Mercurial > mercurial / changelog
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | help
(0) -30000 -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fri, 28 Jan 2022 17:08:30 +0100 merge-actions: make merge action a full featured object
changeset
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 17:08:30 +0100] rev 48711
merge-actions: make merge action a full featured object This open the way for having "smarter" value as action, making the usage code simpler and more flexible. We have to explicitly use __bytes__ call in a couple of place because Python2… Differential Revision: https://phab.mercurial-scm.org/D12114
Fri, 28 Jan 2022 16:25:41 +0100 convert: use the merge action constant
changeset
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 16:25:41 +0100] rev 48710
convert: use the merge action constant The constant exists, lets use them. Otherwise we cannot make these constant more powerful. Differential Revision: https://phab.mercurial-scm.org/D12113
Fri, 28 Jan 2022 16:11:42 +0100 large-file: use the merge action constant
changeset
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 16:11:42 +0100] rev 48709
large-file: use the merge action constant The constant exists, lets use them. Otherwise we cannot make these constant more powerful. Differential Revision: https://phab.mercurial-scm.org/D12112
Fri, 28 Jan 2022 16:41:45 +0100 merge: stop using merge action for pathconflict option
changeset
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 16:41:45 +0100] rev 48708
merge: stop using merge action for pathconflict option This is not the b'r' you are looking for. Differential Revision: https://phab.mercurial-scm.org/D12111
Fri, 28 Jan 2022 14:25:51 +0100 merge: break up a not-so-one-liner for readability
changeset
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 14:25:51 +0100] rev 48707
merge: break up a not-so-one-liner for readability Differential Revision: https://phab.mercurial-scm.org/D12110
Fri, 28 Jan 2022 14:25:45 +0100 merge: break up a not-so-one-liner for readability
changeset
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 14:25:45 +0100] rev 48706
merge: break up a not-so-one-liner for readability Differential Revision: https://phab.mercurial-scm.org/D12109
Fri, 28 Jan 2022 14:25:39 +0100 merge: break up a not-so-one-liner for readability
changeset
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 14:25:39 +0100] rev 48705
merge: break up a not-so-one-liner for readability Differential Revision: https://phab.mercurial-scm.org/D12108
Fri, 28 Jan 2022 14:25:32 +0100 merge: break up a not-so-one-liner for readability
changeset
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 14:25:32 +0100] rev 48704
merge: break up a not-so-one-liner for readability Differential Revision: https://phab.mercurial-scm.org/D12107
Fri, 28 Jan 2022 14:25:05 +0100 merge: break up two not-so-one-liner for extra readability
changeset
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 14:25:05 +0100] rev 48703
merge: break up two not-so-one-liner for extra readability Differential Revision: https://phab.mercurial-scm.org/D12106
Fri, 28 Jan 2022 14:24:41 +0100 merge: break up a not-so-one-liner for readability
changeset
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 28 Jan 2022 14:24:41 +0100] rev 48702
merge: break up a not-so-one-liner for readability Differential Revision: https://phab.mercurial-scm.org/D12105
(0) -30000 -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 tip
mercurial