##// END OF EJS Templates
tests: show that in-mem rebase does not find path dir/file conflicts...
Martin von Zweigbergk -
r40838:e204d9a2 stable
parent child Browse files
Show More
@@ -239,6 +239,16 b' Test reporting of path conflicts'
239 |/
239 |/
240 o 0: b173517d0057 'a'
240 o 0: b173517d0057 'a'
241
241
242 $ mkdir c
243 $ echo c > c/c
244 $ hg add c/c
245 $ hg ci -m 'c/c'
246 BROKEN: This should be a conflict, should not crash
247 $ hg rebase -r . -d 3 -n 2>&1 | grep KeyError
248 KeyError: 'c'
249 BROKEN: This should be a conflict, should not crash
250 $ hg rebase -r 3 -d . -n 2>&1 | grep KeyError
251 KeyError: 'c/c'
242
252
243 $ cd ..
253 $ cd ..
244
254
General Comments 0
You need to be logged in to leave comments. Login now