Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-inmemory.t @ 39132:873f3a56993f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: make sure file is not deleted while checking path conflicts If a file is deleted and a directory of same name is created in the same commit, IMM thinks of that as a file conflict, however the file is deleted and hence the directory can be created. The test change demonstrate the fix. Differential Revision: https://phab.mercurial-scm.org/D4300
author Pulkit Goyal <pulkit@yandex-team.ru>
date Thu, 16 Aug 2018 16:59:40 +0300
parents 02e80e37fbbc
children e338a921a0cd
line wrap: on
line diff
--- a/tests/test-rebase-inmemory.t	Thu Aug 16 16:53:48 2018 +0300
+++ b/tests/test-rebase-inmemory.t	Thu Aug 16 16:59:40 2018 +0300
@@ -177,8 +177,7 @@
   
   $ hg rebase -r . -d 2
   rebasing 4:daf7dfc139cb "a/a" (tip)
-  abort: error: 'a/a' conflicts with file 'a' in 2.
-  [255]
+  saved backup bundle to $TESTTMP/repo1/repo2/.hg/strip-backup/daf7dfc139cb-fdbfcf4f-rebase.hg
 
   $ cd ..