comparison tests/test-update-branches.t @ 19801:41abe2e3e3b7

update: standardize error message for dirty update --check This and following patches will standardize the error message for dirty working directories to "uncommitted changes".
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 20:33:02 -0700
parents 4894e0d9462d
children 2ca325ea57fa
comparison
equal deleted inserted replaced
19800:4894e0d9462d 19801:41abe2e3e3b7
155 $ revtest '-C dirty linear' dirty 1 2 -C 155 $ revtest '-C dirty linear' dirty 1 2 -C
156 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 156 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
157 parent=2 157 parent=2
158 158
159 $ revtest '-c dirty linear' dirty 1 2 -c 159 $ revtest '-c dirty linear' dirty 1 2 -c
160 abort: uncommitted local changes 160 abort: uncommitted changes
161 parent=1 161 parent=1
162 M foo 162 M foo
163 163
164 $ revtest '-c dirtysub linear' dirtysub 1 2 -c 164 $ revtest '-c dirtysub linear' dirtysub 1 2 -c
165 abort: uncommitted local changes 165 abort: uncommitted changes
166 parent=1 166 parent=1
167 M sub/suba 167 M sub/suba
168 168
169 $ norevtest '-c clean same' clean 2 -c 169 $ norevtest '-c clean same' clean 2 -c
170 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 170 1 files updated, 0 files merged, 0 files removed, 0 files unresolved