Mercurial > hg

comparison tests/test-shelve2.t @ 41596:630af04d4ae4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shelve: fix broken backup of conflicting untracked file Differential Revision: https://phab.mercurial-scm.org/D5852
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 04 Feb 2019 20:49:45 -0800
parents 7e09ffb3170d
children 3de4f17f4824
comparison
equal deleted inserted replaced
41595:8785188d1915 41596:630af04d4ae4
137 $ hg shelve 137 $ hg shelve
138 shelved as default 138 shelved as default
139 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 139 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
140 $ echo z > e 140 $ echo z > e
141 $ mkdir dir 141 $ mkdir dir
142 BROKEN: should work the same as when not using --cwd
143 $ hg unshelve --cwd dir 142 $ hg unshelve --cwd dir
144 unshelving change 'default' 143 unshelving change 'default'
145 abort: $ENOENT$
146 [255]
147 $ rmdir dir 144 $ rmdir dir
148 $ cat e 145 $ cat e
146 e
147 $ cat e.orig
149 z 148 z
150 $ test -f e.orig && cat e.orig
151 [1]
152 restore broken state
153 $ touch d
154 $ echo e > e
155 $ hg add d e
156 $ hg shelve --delete default
157 149
158 unshelve and conflicts with tracked and untracked files 150 unshelve and conflicts with tracked and untracked files
159 151
160 preparing: 152 preparing:
161 153