| Mon, 25 Mar 2019 15:44:44 -0700 |
Martin von Zweigbergk |
prune: use action "prune", not "touch", in precheck
stable
|
| Sun, 24 Mar 2019 21:30:12 +0530 |
Pierre-Yves David |
evolve: test a common case of public divergence
|
| Sun, 24 Mar 2019 21:29:44 +0530 |
Sushil khanchi |
evolve: add condition in case of pubdiv to not swap the two div csets
|
| Sat, 23 Mar 2019 02:10:31 +0530 |
Sushil khanchi |
evolve: add logic to handle a particular case in divergence resolution
|
| Fri, 22 Mar 2019 00:16:44 +0530 |
Sushil khanchi |
evolve: add a test reflecting wrong behaviour of content-div resolution
|
| Fri, 22 Mar 2019 09:45:07 -0700 |
Martin von Zweigbergk |
compat: add support for new arg name in memfilectx.__init__
|
| Wed, 13 Mar 2019 17:32:14 +0530 |
Sushil khanchi |
evolve: preserve compatibility for hg < 4.8 versions
|
| Sat, 09 Mar 2019 19:25:34 +0530 |
Sushil khanchi |
evolve: warn user if cset desc is being lost
|
| Sun, 10 Mar 2019 18:00:08 +0100 |
Pierre-Yves David |
changelog: mention latest improvement
|
| Sun, 10 Mar 2019 18:50:00 +0800 |
Anton Shestakov |
stack: make @ (current) more important than $ (some sort of unstable)
|
| Sat, 09 Mar 2019 13:13:53 +0800 |
Anton Shestakov |
stack: show content and phase divergent state and symbol
|
| Sat, 09 Mar 2019 12:54:00 +0800 |
Anton Shestakov |
stack: handle external-children just like other states
|
| Thu, 07 Mar 2019 22:50:56 +0800 |
Anton Shestakov |
stack: optimize revset used for stack --children
|
| Thu, 07 Mar 2019 19:13:45 +0800 |
Anton Shestakov |
stack: rename unstable -> orphan
|
| Wed, 06 Mar 2019 21:47:08 +0800 |
Anton Shestakov |
evolvecmd: compatibility with older geteffectflag() that took a tuple
|
| Wed, 06 Mar 2019 21:42:32 +0800 |
Anton Shestakov |
obshistory: remove unused geteffectflag(), it's been in core since 4.4
|
| Wed, 06 Mar 2019 16:56:25 +0800 |
Anton Shestakov |
compat: remove old vocabulary change fallbacks
|
| Thu, 07 Mar 2019 10:51:48 +0100 |
Pierre-Yves David |
branching: merge with stable
|
| Thu, 07 Mar 2019 01:57:43 +0530 |
Sushil khanchi |
evolve: fix a typo from directory to dirty
stable
|
| Thu, 07 Mar 2019 01:47:14 +0530 |
Sushil khanchi |
evolve: fix the dirstate after setting parents with dirty wdir (issue5930)
stable
|
| Thu, 07 Mar 2019 01:02:05 +0530 |
Sushil khanchi |
evolve: add tests which shows evolve can get confused about copies (issue5930)
stable
|
| Tue, 05 Mar 2019 21:15:05 +0530 |
Sushil khanchi |
test: include some documentation to describe the case briefly
stable
|
| Tue, 05 Mar 2019 20:07:23 +0530 |
Sushil khanchi |
split: use ui.configoverride to preserve phase while commiting
stable
|
| Mon, 04 Mar 2019 12:30:15 +0100 |
Pierre-Yves David |
branching: merge with stable
|
| Mon, 04 Mar 2019 11:54:49 +0100 |
Pierre-Yves David |
changelog: add entries for the recent fixes
stable
|
| Mon, 04 Mar 2019 03:16:51 +0530 |
Sushil khanchi |
evolve: make sure user can recover from conflict (issue6053)
stable
|
| Mon, 04 Mar 2019 02:55:38 +0530 |
Sushil khanchi |
evolve: add test which shows unrecoverable evolve state (issue6053)
stable
|
| Sat, 02 Mar 2019 02:34:29 +0530 |
Sushil khanchi |
evolve: add a test in pubdiv where only merging leads to conflict
|
