Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge6.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 9344f5dd4488
children b2ae81a7df29
comparison
equal deleted inserted replaced
2015:1a09814a5b1f 2019:ced2d3620f95
2 searching for changes 2 searching for changes
3 adding changesets 3 adding changesets
4 adding manifests 4 adding manifests
5 adding file changes 5 adding file changes
6 added 1 changesets with 1 changes to 1 files (+1 heads) 6 added 1 changesets with 1 changes to 1 files (+1 heads)
7 (run 'hg update' to get a working copy) 7 (run 'hg heads' to see heads, 'hg merge' to merge)
8 bar should remain deleted. 8 bar should remain deleted.
9 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo 9 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
10 pulling from ../A2 10 pulling from ../A2
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 0 changes to 0 files (+1 heads) 15 added 1 changesets with 0 changes to 0 files (+1 heads)
16 (run 'hg update' to get a working copy) 16 (run 'hg heads' to see heads, 'hg merge' to merge)
17 bar should remain deleted. 17 bar should remain deleted.
18 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo 18 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo