##// END OF EJS Templates
tests: update divergence test for `hg fix` to actually result in divergence...
Martin von Zweigbergk -
r47594:d083c120 default
parent child Browse files
Show More
@@ -1106,14 +1106,13 b' obsolete revision.'
1106
1106
1107 $ printf "foo\n" > foo.changed
1107 $ printf "foo\n" > foo.changed
1108 $ hg commit -Aqm "foo"
1108 $ hg commit -Aqm "foo"
1109 $ hg debugobsolete `hg parents --template '{node}'`
1109 $ hg ci --amend -m rewritten
1110 1 new obsolescence markers
1111 obsoleted 1 changesets
1112 $ hg --hidden fix -r 0
1110 $ hg --hidden fix -r 0
1113 abort: fixing obsolete revision could cause divergence
1111 abort: fixing obsolete revision could cause divergence
1114 [255]
1112 [255]
1115
1113
1116 $ hg --hidden fix -r 0 --config experimental.evolution.allowdivergence=true
1114 $ hg --hidden fix -r 0 --config experimental.evolution.allowdivergence=true
1115 2 new content-divergent changesets
1117 $ hg cat -r tip foo.changed
1116 $ hg cat -r tip foo.changed
1118 FOO
1117 FOO
1119
1118
General Comments 0
You need to be logged in to leave comments. Login now