Mercurial > hg

comparison tests/test-pull-update.t @ 19798:76df01e56e7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: improve error message for clean non-linear update
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 17:43:33 -0700
parents f2719b387380
children 216cc65cf227
comparison
equal deleted inserted replaced
19797:a9abdb168425 19798:76df01e56e7f
23 searching for changes 23 searching for changes
24 adding changesets 24 adding changesets
25 adding manifests 25 adding manifests
26 adding file changes 26 adding file changes
27 added 1 changesets with 1 changes to 1 files (+1 heads) 27 added 1 changesets with 1 changes to 1 files (+1 heads)
28 not updating: crosses branches (merge branches or update --check to force update) 28 not updating: not a linear update
29 (merge or update --check to force update)
29 30
30 $ cd ../tt 31 $ cd ../tt
31 32
32 Should not update: 33 Should not update:
33 34
36 searching for changes 37 searching for changes
37 adding changesets 38 adding changesets
38 adding manifests 39 adding manifests
39 adding file changes 40 adding file changes
40 added 1 changesets with 1 changes to 1 files (+1 heads) 41 added 1 changesets with 1 changes to 1 files (+1 heads)
41 not updating: crosses branches (merge branches or update --check to force update) 42 not updating: not a linear update
43 (merge or update --check to force update)
42 44
43 $ HGMERGE=true hg merge 45 $ HGMERGE=true hg merge
44 merging foo 46 merging foo
45 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 47 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
46 (branch merge, don't forget to commit) 48 (branch merge, don't forget to commit)