comparison tests/test-backout.t @ 20276:6545770bd379

backout: add a message after backout that need manual commit In some case Backout silently succeeded to back out but left all the change uncommitted. This may be confusing for user so this changeset add a note reminding to commit. Other backout case already actively informs the user about created commit.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 08 Jan 2014 17:23:26 -0800
parents 2123d27ff75d
children ba619c50a355
comparison
equal deleted inserted replaced
20275:2123d27ff75d 20276:6545770bd379
187 update: (current) 187 update: (current)
188 188
189 without --merge 189 without --merge
190 $ hg backout -d '3 0' 1 --tool=true 190 $ hg backout -d '3 0' 1 --tool=true
191 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 191 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
192 changeset 22bca4c721e5 backed out, don't forget to commit.
192 $ hg locate b 193 $ hg locate b
193 b 194 b
194 $ hg update -C tip 195 $ hg update -C tip
195 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 196 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
196 $ hg locate b 197 $ hg locate b
322 adding file2 323 adding file2
323 324
324 without --merge 325 without --merge
325 $ hg backout -r 1 --tool=true 326 $ hg backout -r 1 --tool=true
326 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 327 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
328 changeset bf1602f437f3 backed out, don't forget to commit.
327 $ hg branch 329 $ hg branch
328 branch2 330 branch2
329 $ hg status -A 331 $ hg status -A
330 R file1 332 R file1
331 C default 333 C default