| Mon, 21 May 2018 13:07:49 +0200 |
Boris Feld |
compat: fix obslog with Mercurial 4.6+
|
| Sat, 19 May 2018 18:26:36 +0530 |
Faheem Mitha |
debian: add line to clean-docs target to delete additional docs file
stable
|
| Mon, 14 May 2018 15:25:38 -0700 |
Martin von Zweigbergk |
amend: use context manager for locks (issue5887)
stable
|
| Thu, 10 May 2018 21:37:28 -0700 |
Martin von Zweigbergk |
evolve: point to '--abort' in verbose status message
stable
|
| Sun, 22 Apr 2018 20:14:42 +0530 |
Pulkit Goyal |
evolvecmd: add comments and new lines in content-divergence handling logic
|
| Sun, 29 Apr 2018 19:18:54 +0530 |
Pulkit Goyal |
evolve: show cset hash in "merging conetnt-divergent changeset"
|
| Sun, 29 Apr 2018 19:14:41 +0530 |
Pulkit Goyal |
evolve: show cset hash in "update to local conflict" message
|
| Sun, 29 Apr 2018 19:11:29 +0530 |
Pulkit Goyal |
evolve: use hg.updaterepo() instead of hg.update() to hide stats
|
| Sun, 29 Apr 2018 19:04:18 +0530 |
Pulkit Goyal |
evolve: fix the conflicts error message during content-divergence resolution
|
| Sun, 29 Apr 2018 18:51:56 +0530 |
Pulkit Goyal |
evolve: add logic to continue interrupted content-divergence resolution
|
| Sun, 29 Apr 2018 18:48:36 +0530 |
Pulkit Goyal |
evolve: store the evolvestate file when encountering conflicts
|
| Sun, 29 Apr 2018 18:13:29 +0530 |
Pulkit Goyal |
evolve: take out logic to complete phase-divergence in separate fn
|
