Mercurial > hg
diff tests/test-origbackup-conflict.t @ 42343:d8e55c0c642c
util: make util.dirs() and util.finddirs() include root directory (API)
This changes the behavior of test-origbackup-conflict.t so it no
longer errors out when the backup path points to an existing
file. Instead, it replaces the file by a directory. That seems
reasonable to me.
Differential Revision: https://phab.mercurial-scm.org/D6403
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 16 May 2017 11:00:38 -0700 |
parents | 0b46e1aa7760 |
children |
line wrap: on
line diff
--- a/tests/test-origbackup-conflict.t Thu Jul 13 23:43:16 2017 -0700 +++ b/tests/test-origbackup-conflict.t Tue May 16 11:00:38 2017 -0700 @@ -129,8 +129,9 @@ b/c: replacing untracked file getting b/c creating directory: $TESTTMP/repo/.hg/badorigbackups/b - abort: $ENOTDIR$: *$TESTTMP/repo/.hg/badorigbackups/b* (glob) - [255] - $ cat .hg/badorigbackups - data - + removing conflicting file: $TESTTMP/repo/.hg/badorigbackups + getting d + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + (activating bookmark c1) + $ ls .hg/badorigbackups/b + c