Mercurial > hg

comparison tests/test-update-branches.t @ 19799:ab3e42225dbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: add error message for dirty non-linear update with no rev Previously, the error message for a dirty non-linear update was the same (and relatively unhelpful) whether or not a rev was specified. This patch and an upcoming one will introduce separate, more helpful hints.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 20:07:30 -0700
parents 76df01e56e7f
children 4894e0d9462d
comparison
equal deleted inserted replaced
19798:76df01e56e7f 19799:ab3e42225dbc
121 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 121 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
122 parent=2 122 parent=2
123 M sub/suba 123 M sub/suba
124 124
125 $ revtest 'none dirty same' dirty 2 3 125 $ revtest 'none dirty same' dirty 2 3
126 abort: crosses branches (merge branches or use --clean to discard changes) 126 abort: uncommitted changes
127 (commit or update --clean to discard changes)
127 parent=2 128 parent=2
128 M foo 129 M foo
129 130
130 $ revtest 'none dirtysub same' dirtysub 2 3 131 $ revtest 'none dirtysub same' dirtysub 2 3
131 abort: crosses branches (merge branches or use --clean to discard changes) 132 abort: uncommitted changes
133 (commit or update --clean to discard changes)
132 parent=2 134 parent=2
133 M sub/suba 135 M sub/suba
134 136
135 $ revtest 'none dirty cross' dirty 3 4 137 $ revtest 'none dirty cross' dirty 3 4
136 abort: crosses branches (merge branches or use --clean to discard changes) 138 abort: uncommitted changes
139 (commit or update --clean to discard changes)
137 parent=3 140 parent=3
138 M foo 141 M foo
139 142
140 $ revtest 'none dirtysub cross' dirtysub 3 4 143 $ revtest 'none dirtysub cross' dirtysub 3 4
141 abort: crosses branches (merge branches or use --clean to discard changes) 144 abort: uncommitted changes
145 (commit or update --clean to discard changes)
142 parent=3 146 parent=3
143 M sub/suba 147 M sub/suba
144 148
145 $ revtest '-C dirty linear' dirty 1 2 -C 149 $ revtest '-C dirty linear' dirty 1 2 -C
146 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 150 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
221 225
222 Test that 5 is not detected as a valid destination from 2 226 Test that 5 is not detected as a valid destination from 2
223 $ hg up --quiet 0 227 $ hg up --quiet 0
224 $ hg up --quiet 2 228 $ hg up --quiet 2
225 $ hg up 5 229 $ hg up 5
226 abort: crosses branches (merge branches or use --clean to discard changes) 230 abort: uncommitted changes
231 (commit or update --clean to discard changes)
227 [255] 232 [255]