Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-mq.out @ 3699:4bafcf7aeb32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qrefresh: fix handling of added files (including copies) in the slow path
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 20 Nov 2006 19:32:42 -0200
parents da262f35fbc8
children 4c158de5f245
comparison
equal deleted inserted replaced
3698:a9090b264250 3699:4bafcf7aeb32
199 copy from new 199 copy from new
200 copy to copy 200 copy to copy
201 diff --git a/new b/copy 201 diff --git a/new b/copy
202 copy from new 202 copy from new
203 copy to copy 203 copy to copy
204 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
205 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
206 adding branch
207 adding changesets
208 adding manifests
209 adding file changes
210 added 1 changesets with 1 changes to 1 files
211 (run 'hg update' to get a working copy)
212 Patch queue now empty
213 applying bar
214 Now at: bar
215 diff --git a/bar b/bar
216 new file mode 100644
217 --- /dev/null
218 +++ b/bar
219 @@ -0,0 +1,1 @@
220 +bar
221 diff --git a/foo b/baz
222 rename from foo
223 rename to baz
224 2 baz (foo)
225
226 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
227 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
228 adding branch
229 adding changesets
230 adding manifests
231 adding file changes
232 added 1 changesets with 1 changes to 1 files
233 (run 'hg update' to get a working copy)
234 Patch queue now empty
235 applying bar
236 Now at: bar
237 diff --git a/foo b/bleh
238 rename from foo
239 rename to bleh
240 diff --git a/quux b/quux
241 new file mode 100644
242 --- /dev/null
243 +++ b/quux
244 @@ -0,0 +1,1 @@
245 +bar
246 3 bleh (foo)