Thu, 07 Mar 2019 10:51:48 +0100 branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 07 Mar 2019 10:51:48 +0100] rev 4428
branching: merge with stable
Thu, 07 Mar 2019 01:57:43 +0530 evolve: fix a typo from directory to dirty stable
Sushil khanchi <sushilkhanchi97@gmail.com> [Thu, 07 Mar 2019 01:57:43 +0530] rev 4427
evolve: fix a typo from directory to dirty
Thu, 07 Mar 2019 01:47:14 +0530 evolve: fix the dirstate after setting parents with dirty wdir (issue5930) stable
Sushil khanchi <sushilkhanchi97@gmail.com> [Thu, 07 Mar 2019 01:47:14 +0530] rev 4426
evolve: fix the dirstate after setting parents with dirty wdir (issue5930) Before this patch, during an interrupted evolve it can be confused about copies. This patch fix the dirstate when parents are changed using dirstate.setparents() with a dirty wdir. Changes in test file reflect the fixed behaviour.
(0) -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 tip