| Mon, 23 Apr 2018 14:48:53 +0530 |
Pulkit Goyal |
evolve: create new commit while resolving content-divergence
|
file |
diff |
annotate
|
| Tue, 22 May 2018 20:33:42 +0530 |
Pulkit Goyal |
content-divergence: store the resolved revs in evolvestate['replacements']
|
file |
diff |
annotate
|
| Mon, 21 May 2018 14:56:51 +0200 |
Boris Feld |
test: update to new outputs
|
file |
diff |
annotate
|
| Sun, 29 Apr 2018 19:18:54 +0530 |
Pulkit Goyal |
evolve: show cset hash in "merging conetnt-divergent changeset"
|
file |
diff |
annotate
|
| Sun, 29 Apr 2018 19:14:41 +0530 |
Pulkit Goyal |
evolve: show cset hash in "update to local conflict" message
|
file |
diff |
annotate
|
| Sun, 29 Apr 2018 19:11:29 +0530 |
Pulkit Goyal |
evolve: use hg.updaterepo() instead of hg.update() to hide stats
|
file |
diff |
annotate
|
| Sun, 29 Apr 2018 19:04:18 +0530 |
Pulkit Goyal |
evolve: fix the conflicts error message during content-divergence resolution
|
file |
diff |
annotate
|
| Sun, 29 Apr 2018 18:51:56 +0530 |
Pulkit Goyal |
evolve: add logic to continue interrupted content-divergence resolution
|
file |
diff |
annotate
|
| Wed, 25 Apr 2018 01:58:45 +0100 |
Pierre-Yves David |
testcompat: update output for Mercurial 4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Mon, 23 Apr 2018 12:23:00 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Mon, 23 Apr 2018 12:11:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Sun, 22 Apr 2018 11:40:17 +0200 |
Pierre-Yves David |
evolve: point to '--abort' in error message
|
file |
diff |
annotate
|
| Wed, 28 Mar 2018 14:11:13 +0530 |
Pulkit Goyal |
evolve: show a message when evolution leads to no changes to commit
|
file |
diff |
annotate
|
| Fri, 23 Mar 2018 17:46:46 +0530 |
Pulkit Goyal |
evolve: use the new rebased changeset to resolve phase-divergence
|
file |
diff |
annotate
|
| Fri, 23 Mar 2018 17:20:20 +0530 |
Pulkit Goyal |
tests: add one more test case about handling of phase-divergence by evolve
|
file |
diff |
annotate
|
| Wed, 21 Mar 2018 16:32:54 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.3 into mercurial-4.2
mercurial-4.2
|
file |
diff |
annotate
|
| Wed, 21 Mar 2018 16:18:31 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Wed, 21 Mar 2018 16:06:17 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Mon, 12 Mar 2018 15:40:28 -0700 |
Martin von Zweigbergk |
evolve: include "operation" metadata in obsmarkers
|
file |
diff |
annotate
|
| Mon, 12 Mar 2018 23:26:25 -0700 |
Martin von Zweigbergk |
tests: do not glob out fixed dates
|
file |
diff |
annotate
|
| Mon, 29 Jan 2018 00:09:44 +0530 |
Pulkit Goyal |
evolve: show the updated working directory after `hg evolve --continue`
|
file |
diff |
annotate
|
| Sat, 27 Jan 2018 21:15:27 +0530 |
Pulkit Goyal |
evolve: add evolve info to cmdutil.afterresolvedstates
|
file |
diff |
annotate
|
| Thu, 11 Jan 2018 20:03:20 +0530 |
Pulkit Goyal |
grab: add a command to grab a commit and update to it
|
file |
diff |
annotate
|
| Sat, 20 Jan 2018 11:59:36 +0100 |
Pierre-Yves David |
test: update with new 'update' hint about obsfate
|
file |
diff |
annotate
|
| Tue, 16 Jan 2018 04:35:34 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Tue, 16 Jan 2018 04:32:43 +0100 |
Pierre-Yves David |
branching: merge stable back into default
|
file |
diff |
annotate
|
| Mon, 15 Jan 2018 19:52:00 +0100 |
Pierre-Yves David |
branching: backed out test output changes from core-1905aac253f0
stable
|
file |
diff |
annotate
|
| Mon, 15 Jan 2018 19:42:44 +0100 |
Pierre-Yves David |
branching: backed out test output changes from core-02fdb8c018aa
stable
|
file |
diff |
annotate
|
| Sat, 06 Jan 2018 18:48:15 +0530 |
Pulkit Goyal |
evolve: don't use graftstate for continuing `hg evolve`
|
file |
diff |
annotate
|
| Fri, 05 Jan 2018 17:15:43 +0530 |
Pulkit Goyal |
evolve: use new trouble names in commit messages
|
file |
diff |
annotate
|