diff .hgignore @ 4438:a6bdb02a1902

evolve: warn user if cset desc is being lost In public divergence when merging results in same as public cset, we only create markers to solve the divergence i.e. [(public, (other,))] In this case if other cset had a desc which was different from public that will be lost. So this print out a warning message to user that desc of non-public cset is being lost. Changes in test files reflect the added behaviour.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sat, 09 Mar 2019 19:25:34 +0530
parents aad37ffd7d58
children ba316ce15040
line wrap: on
line diff