Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.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 2da2d46862fb
children 5c4496ed152d
comparison
equal deleted inserted replaced
2015:1a09814a5b1f 2019:ced2d3620f95
99 b versions differ, resolve 99 b versions differ, resolve
100 this update spans a branch affecting the following files: 100 this update spans a branch affecting the following files:
101 a (resolve) 101 a (resolve)
102 b (resolve) 102 b (resolve)
103 aborting update spanning branches! 103 aborting update spanning branches!
104 (use update -m to merge across branches or -C to lose changes) 104 (use 'hg merge' to merge across branches or '-C' to lose changes)
105 failed 105 failed
106 abort: outstanding uncommitted changes 106 abort: outstanding uncommitted changes
107 failed 107 failed
108 resolving manifests 108 resolving manifests
109 force None allow 1 moddirstate True linear False 109 force None allow 1 moddirstate True linear False