equal
deleted
inserted
replaced
927 | () [default] draft |
927 | () [default] draft |
928 o 0:8fa14d15e168 added hgignore |
928 o 0:8fa14d15e168 added hgignore |
929 () [default] draft |
929 () [default] draft |
930 |
930 |
931 |
931 |
932 Test to make sure that evolve don't fall into unrecoverable state (issue6053): |
932 Test to make sure that evolve don't fall into unrecoverable state (issue6053) |
933 ------------------------------------------------------------------------------ |
933 ------------------------------------------------------------------------------ |
|
934 |
|
935 It happened when two divergent csets has different parent (need relocation) |
|
936 and resolution parent is obsolete. So this issue triggered when during |
|
937 relocation we hit conflicts. So lets make the repo as described. |
|
938 |
934 $ cd .. |
939 $ cd .. |
935 $ hg init localside |
940 $ hg init localside |
936 $ cd localside |
941 $ cd localside |
937 $ for ch in a b c d e; do |
942 $ for ch in a b c d e; do |
938 > echo $ch > $ch; |
943 > echo $ch > $ch; |
952 o 0:9092f1db7931 added a |
957 o 0:9092f1db7931 added a |
953 () [default] draft |
958 () [default] draft |
954 |
959 |
955 $ echo ee > e |
960 $ echo ee > e |
956 $ hg amend -m "updated e" |
961 $ hg amend -m "updated e" |
957 |
|
958 $ hg up 1 -q |
962 $ hg up 1 -q |
|
963 |
|
964 To make sure we hit conflict while relocating |
959 $ echo dd > d |
965 $ echo dd > d |
960 $ echo ee > e |
966 $ echo ee > e |
961 $ hg add d e |
967 $ hg add d e |
962 $ hg ci -m "updated e" |
968 $ hg ci -m "updated e" |
963 created new head |
969 created new head |
964 |
970 |
|
971 Lets create divergence |
965 $ hg prune 4 -s . --hidden |
972 $ hg prune 4 -s . --hidden |
966 1 changesets pruned |
973 1 changesets pruned |
967 2 new content-divergent changesets |
974 2 new content-divergent changesets |
968 |
975 |
|
976 Making obsolete resolution parent |
969 $ hg prune 3 |
977 $ hg prune 3 |
970 1 changesets pruned |
978 1 changesets pruned |
971 1 new orphan changesets |
979 1 new orphan changesets |
972 |
980 |
973 $ hg glog |
981 $ hg glog |