comparison tests/test-split.t @ 1698:dd6f090b7342 mercurial-3.5

merge with stable throug 3.6 branch
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 06 May 2016 00:00:14 +0200
parents c2739551ea4e 898dfca94433
children 1dbb8fdb725a
comparison
equal deleted inserted replaced
1606:c2739551ea4e 1698:dd6f090b7342
121 user: test 121 user: test
122 date: Thu Jan 01 00:00:00 1970 +0000 122 date: Thu Jan 01 00:00:00 1970 +0000
123 summary: add _a 123 summary: add _a
124 124
125 125
126 Cannot split a commit with uncommited changes 126 Cannot split a commit with uncommitted changes
127 $ hg up "desc(_c)" 127 $ hg up "desc(_c)"
128 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 128 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
129 $ echo "_cd" > _c 129 $ echo "_cd" > _c
130 $ hg split 130 $ hg split
131 abort: uncommitted changes 131 abort: uncommitted changes