Mercurial > hg
view tests/test-conflict.t @ 20446:d258486604f4
revset: changed limit revset implementation to work with lazy revsets
Performance benchmarking:
$ time hg log -qr "first(branch(default))"
0:9117c6561b0b
real 0m3.130s
user 0m3.025s
sys 0m0.074s
$ time ./hg log -qr "first(branch(default))"
0:9117c6561b0b
real 0m0.300s
user 0m0.198s
sys 0m0.069s
author | Lucas Moscovicz <lmoscovicz@fb.com> |
---|---|
date | Tue, 28 Jan 2014 16:19:30 -0800 |
parents | 2371f4aea665 |
children | 25d5a9ecbb85 |
line wrap: on
line source
$ hg init $ echo "nothing" > a $ hg add a $ hg commit -m ancestor $ echo "something" > a $ hg commit -m branch1 $ hg co 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo "something else" > a $ hg commit -m branch2 created new head $ hg merge 1 merging a warning: conflicts during merge. merging a incomplete! (edit conflicts, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] $ hg id 32e80765d7fe+75234512624c+ tip $ cat a <<<<<<< local something else ======= something >>>>>>> other $ hg status M a ? a.orig