Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-filebranch.out @ 2019:ced2d3620f95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 29 Mar 2006 10:27:16 -0800
parents 7544700fd931
children 3053fc33f545
comparison
equal deleted inserted replaced
2015:1a09814a5b1f 2019:ced2d3620f95
11 searching for changes 11 searching for changes
12 adding changesets 12 adding changesets
13 adding manifests 13 adding manifests
14 adding file changes 14 adding file changes
15 added 1 changesets with 2 changes to 2 files (+1 heads) 15 added 1 changesets with 2 changes to 2 files (+1 heads)
16 (run 'hg update' to get a working copy) 16 (run 'hg heads' to see heads, 'hg merge' to merge)
17 merging for foo 17 merging for foo
18 resolving manifests 18 resolving manifests
19 getting bar 19 getting bar
20 merging foo 20 merging foo
21 resolving foo 21 resolving foo