| Tue, 05 Mar 2019 20:07:23 +0530 |
Sushil khanchi |
split: use ui.configoverride to preserve phase while commiting
stable
|
changeset |
files
|
| Mon, 04 Mar 2019 12:30:15 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Mon, 04 Mar 2019 11:54:49 +0100 |
Pierre-Yves David |
changelog: add entries for the recent fixes
stable
|
changeset |
files
|
| Mon, 04 Mar 2019 03:16:51 +0530 |
Sushil khanchi |
evolve: make sure user can recover from conflict (issue6053)
stable
|
changeset |
files
|
| Mon, 04 Mar 2019 02:55:38 +0530 |
Sushil khanchi |
evolve: add test which shows unrecoverable evolve state (issue6053)
stable
|
changeset |
files
|
| Sat, 02 Mar 2019 02:34:29 +0530 |
Sushil khanchi |
evolve: add a test in pubdiv where only merging leads to conflict
|
changeset |
files
|
| Thu, 28 Feb 2019 03:12:39 +0530 |
Sushil khanchi |
evolve: cover continue case in pubdiv when merging results in same as public
|
changeset |
files
|
| Fri, 22 Feb 2019 01:02:51 +0530 |
Sushil khanchi |
evolve: handle a case in pubic-div when merging results in same as public
|
changeset |
files
|
| Thu, 28 Feb 2019 02:08:58 +0530 |
Sushil khanchi |
evolve: rename npublicdiv to publicnode
|
changeset |
files
|
| Thu, 28 Feb 2019 02:02:18 +0530 |
Sushil khanchi |
evolve: in pubdiv resolution make sure that transaction get closed
|
changeset |
files
|
| Mon, 25 Feb 2019 22:50:24 +0530 |
Sushil khanchi |
evolve: pin the public cset to local side in merging when solving public div
|
changeset |
files
|
| Sat, 23 Feb 2019 00:47:14 +0530 |
Sushil khanchi |
evolve: add tests of relocation case in public divergence
|
changeset |
files
|
| Sun, 03 Mar 2019 16:29:32 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Sat, 02 Mar 2019 01:43:14 +0530 |
Sushil khanchi |
split: make sure hg split preserve the phase of splitting cset (issue6048)
stable
|
changeset |
files
|
| Sat, 02 Mar 2019 01:37:04 +0530 |
Sushil khanchi |
split: add tests which demonstrate the issue6048
stable
|
changeset |
files
|