Mercurial > hg

comparison tests/test-mq.out @ 6336:4b0c9c674707

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warn about new heads on commit (issue842)
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 21 Mar 2008 11:06:02 +0100
parents 9db24a36d182
children 0750f11152fe
comparison
equal deleted inserted replaced
6335:e29557d687c9 6336:4b0c9c674707
321 copy to copy 321 copy to copy
322 diff --git a/new b/copy 322 diff --git a/new b/copy
323 copy from new 323 copy from new
324 copy to copy 324 copy to copy
325 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 325 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
326 created new head
326 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 327 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
327 adding branch 328 adding branch
328 adding changesets 329 adding changesets
329 adding manifests 330 adding manifests
330 adding file changes 331 adding file changes
399 applying addbucephalus 400 applying addbucephalus
400 Now at: addbucephalus 401 Now at: addbucephalus
401 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus 402 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus
402 % strip again 403 % strip again
403 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 404 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
405 created new head
404 merging foo 406 merging foo
405 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 407 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
406 (branch merge, don't forget to commit) 408 (branch merge, don't forget to commit)
407 changeset: 3:99615015637b 409 changeset: 3:99615015637b
408 tag: tip 410 tag: tip