Wed, 23 May 2018 01:11:59 +0530 |
Pulkit Goyal |
evolve: add a help topic `Interrupted-Evolve`
|
file |
diff |
annotate
|
Tue, 05 Jun 2018 03:37:15 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
Thu, 24 May 2018 02:12:14 +0530 |
Pulkit Goyal |
evolve: return the new node formed only as the replacement
|
file |
diff |
annotate
|
Mon, 04 Jun 2018 04:03:02 +0530 |
Pulkit Goyal |
evolve: prompt user for branch selection while resolving content-divergence
|
file |
diff |
annotate
|
Tue, 05 Jun 2018 03:51:01 +0530 |
Pulkit Goyal |
evolve: pass the base revision in _completecontentdivergent()
|
file |
diff |
annotate
|
Tue, 05 Jun 2018 03:49:49 +0530 |
Pulkit Goyal |
evolve: store the base of content-divergents in evolvestate
|
file |
diff |
annotate
|
Tue, 05 Jun 2018 00:53:21 +0530 |
Pulkit Goyal |
evolve: use cmdrewrite.amend() instead of creating a new commit
|
file |
diff |
annotate
|
Sun, 27 May 2018 02:32:58 +0530 |
Pulkit Goyal |
evolve: fix `hg abort` when hg next --evolve leads to conflicts (issue5897)
stable
|
file |
diff |
annotate
|
Thu, 24 May 2018 17:50:02 +0530 |
Pulkit Goyal |
evolve: add an `--update` flag to `hg evolve` command
|
file |
diff |
annotate
|
Thu, 24 May 2018 00:58:50 +0530 |
Pulkit Goyal |
evolve: fix storage of replacements and temprevs node in evolvestate
|
file |
diff |
annotate
|
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
|
Wed, 23 May 2018 02:46:20 +0530 |
Pulkit Goyal |
evolve: make `--abort` strip the temporary revs created during resolution
|
file |
diff |
annotate
|
Wed, 23 May 2018 02:43:23 +0530 |
Pulkit Goyal |
evolve: store a list of temprevs in evolvestate
|
file |
diff |
annotate
|
Wed, 23 May 2018 02:36:14 +0530 |
Pulkit Goyal |
evolve: check for None before adding in set of revisions to strip
|
file |
diff |
annotate
|
Wed, 23 May 2018 02:33:14 +0530 |
Pulkit Goyal |
evolve: return the new replacement node to be stored in evolvestate
|
file |
diff |
annotate
|
Wed, 23 May 2018 02:39:38 +0530 |
Pulkit Goyal |
evolve: don't make values of replacements dict lists
|
file |
diff |
annotate
|
Sun, 22 Apr 2018 20:14:42 +0530 |
Pulkit Goyal |
evolvecmd: add comments and new lines in content-divergence handling logic
|
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
|
Sun, 29 Apr 2018 18:48:36 +0530 |
Pulkit Goyal |
evolve: store the evolvestate file when encountering conflicts
|
file |
diff |
annotate
|
Sun, 29 Apr 2018 18:13:29 +0530 |
Pulkit Goyal |
evolve: take out logic to complete phase-divergence in separate fn
|
file |
diff |
annotate
|
Sun, 29 Apr 2018 17:54:01 +0530 |
Pulkit Goyal |
evolve: store divergent nodes in evolvestate when resolving content-divergence
|
file |
diff |
annotate
|
Tue, 24 Apr 2018 12:07:35 +0100 |
Pierre-Yves David |
compat: handle lack of allpredecessors for Mercurial 4.3
stable
|
file |
diff |
annotate
|
Sun, 22 Apr 2018 11:40:17 +0200 |
Pierre-Yves David |
evolve: point to '--abort' in error message
|
file |
diff |
annotate
|
Thu, 19 Apr 2018 16:27:13 +0200 |
Pierre-Yves David |
compat: drop compatibility layer for pager
|
file |
diff |
annotate
|
Thu, 19 Apr 2018 16:25:17 +0200 |
Pierre-Yves David |
compat: drop compatibility layer for duplicatecopies
|
file |
diff |
annotate
|
Thu, 19 Apr 2018 16:21:44 +0200 |
Pierre-Yves David |
compat: drop compatibility layer for bookmark.applychanges
|
file |
diff |
annotate
|
Thu, 19 Apr 2018 16:15:10 +0200 |
Pierre-Yves David |
compat: from compatibility layer for allprecursors
|
file |
diff |
annotate
|
Thu, 19 Apr 2018 16:12:37 +0200 |
Pierre-Yves David |
compat: drop compatibility layer for successorssets
|
file |
diff |
annotate
|
Thu, 19 Apr 2018 16:07:23 +0200 |
Pierre-Yves David |
compat: from compatibility layer for createmarkers
|
file |
diff |
annotate
|
Wed, 18 Apr 2018 10:08:05 +0200 |
Pierre-Yves David |
compat: rename resolvepartialhexnodeid to resolvehexnodeidprefix
|
file |
diff |
annotate
|
Tue, 17 Apr 2018 19:42:26 +0200 |
Pierre-Yves David |
compat: fallback to compatible partial lookup prior to 4.6
|
file |
diff |
annotate
|
Mon, 16 Apr 2018 10:58:06 -0700 |
Martin von Zweigbergk |
relocate: look up partial nodeids in unfiltered repo
|
file |
diff |
annotate
|
Mon, 16 Apr 2018 17:11:27 +0200 |
Pierre-Yves David |
compat: avoid using partial node ID in lookup
|
file |
diff |
annotate
|
Thu, 29 Mar 2018 17:34:51 +0530 |
Pulkit Goyal |
evolve: restore bookmarks correctly after `hg evolve --abort`
|
file |
diff |
annotate
|
Thu, 29 Mar 2018 13:01:05 -0700 |
Kyle Lippincott |
evolve: do not exit 1 when there are no troubled changesets (issue5823)
|
file |
diff |
annotate
|
Sat, 31 Mar 2018 11:53:09 +0200 |
Pierre-Yves David |
style: fix a couple of pyflakes complains
|
file |
diff |
annotate
|
Thu, 29 Mar 2018 16:43:28 +0530 |
Pulkit Goyal |
evolve: add a `--abort` flag for `hg evolve` command
|
file |
diff |
annotate
|
Wed, 28 Mar 2018 17:47:49 +0530 |
Pulkit Goyal |
evolve: internationalize the entry of --list in hg evolve help
|
file |
diff |
annotate
|
Wed, 28 Mar 2018 17:37:10 +0530 |
Pulkit Goyal |
evolve: add evolvestate as an argument to _finalizerelocate()
|
file |
diff |
annotate
|
Wed, 28 Mar 2018 17:33:54 +0530 |
Pulkit Goyal |
evolve: add evolvestate as an argument to evolvecmd.relocate()
|
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
|
Wed, 28 Mar 2018 13:48:34 +0530 |
Pulkit Goyal |
evolve: pass the instability category to relocate() and _finalizerelocate()
|
file |
diff |
annotate
|
Sat, 24 Mar 2018 17:21:42 +0530 |
Pulkit Goyal |
evolve: handle interrupted phase-divergence resolution gracefully
|
file |
diff |
annotate
|
Sat, 24 Mar 2018 16:41:14 +0530 |
Pulkit Goyal |
evolve: move logic to resolve phase-divergence in a new function
|
file |
diff |
annotate
|
Sat, 24 Mar 2018 16:38:03 +0530 |
Pulkit Goyal |
evolve: store the precursor of phase-divergent in evolvestate
|
file |
diff |
annotate
|
Sat, 24 Mar 2018 13:17:05 +0530 |
Pulkit Goyal |
evolve: move logic to complete interrupted relocation to new fn
|
file |
diff |
annotate
|
Sat, 24 Mar 2018 12:58:12 +0530 |
Pulkit Goyal |
evolve: move logic to complete interrupted orphan resolution to new fn
|
file |
diff |
annotate
|
Fri, 23 Mar 2018 19:36:08 +0530 |
Pulkit Goyal |
evolve: write data to evolvestate in case on conflicts in phase-divergence
|
file |
diff |
annotate
|
Fri, 23 Mar 2018 19:16:25 +0530 |
Pulkit Goyal |
evolve: explicitly turn revs to list before storing into evolvestate
|
file |
diff |
annotate
|
Fri, 23 Mar 2018 17:49:26 +0530 |
Pulkit Goyal |
evolve: make sure bookmarks are moved after phase-divergence resolution
|
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:21:09 +0530 |
Pulkit Goyal |
evolvecmd: add a detailed comment and some newlines
|
file |
diff |
annotate
|
Fri, 30 Mar 2018 20:26:54 +0200 |
Pierre-Yves David |
compat: use updateresult API if available
|
file |
diff |
annotate
|
Fri, 23 Mar 2018 12:39:00 +0530 |
Pulkit Goyal |
evolve: replace bumped in function name to phasedivergence
|
file |
diff |
annotate
|
Fri, 23 Mar 2018 12:35:37 +0530 |
Pulkit Goyal |
evolve: drop duplicate import of rewriteutil._bookmarksupdater
|
file |
diff |
annotate
|