Mercurial > hg

comparison tests/test-rebase-inmemory.t @ 40803:44c2e80db985 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: fix dir/file conflict detection when using in-mem merge Differential Revision: https://phab.mercurial-scm.org/D5360
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 03 Dec 2018 11:14:44 -0800
parents e204d9a27528
children 9b1d5eea07f9
comparison
equal deleted inserted replaced
40802:e204d9a27528 40803:44c2e80db985
241 241
242 $ mkdir c 242 $ mkdir c
243 $ echo c > c/c 243 $ echo c > c/c
244 $ hg add c/c 244 $ hg add c/c
245 $ hg ci -m 'c/c' 245 $ hg ci -m 'c/c'
246 BROKEN: This should be a conflict, should not crash 246 $ hg rebase -r . -d 3 -n
247 $ hg rebase -r . -d 3 -n 2>&1 | grep KeyError 247 starting dry-run rebase; repository will not be changed
248 KeyError: 'c' 248 rebasing 8:755f0104af9b "c/c" (tip)
249 BROKEN: This should be a conflict, should not crash 249 abort: error: 'c/c' conflicts with file 'c' in 3.
250 $ hg rebase -r 3 -d . -n 2>&1 | grep KeyError 250 [255]
251 KeyError: 'c/c' 251 $ hg rebase -r 3 -d . -n
252 starting dry-run rebase; repository will not be changed
253 rebasing 3:844a7de3e617 "c"
254 abort: error: file 'c' cannot be written because 'c/' is a folder in 755f0104af9b (containing 1 entries: c/c)
255 [255]
252 256
253 $ cd .. 257 $ cd ..
254 258
255 Test dry-run rebasing 259 Test dry-run rebasing
256 260