Mercurial > hg

view tests/test-hgrc.out @ 9717:68a1b9d0663e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: allow branch crossing without -c or -C, with no uncommitted changes Update will now allow crossing branches within the same named branch, when given a specific revision, if the working dir is clean, without requiring the -c or -C option. Abort if no revision is given and this would cross branches. Minor change to abort message if uncommitted changes are found. Modify test-update-branches and output to reflect the altered case. Modify test-merge5.out to reflect the altered case. Modify test-up-local-change.out with new message.
author Stuart W Marks <smarks@smarks.org>
date Thu, 05 Nov 2009 10:53:59 +0100
parents a3d73b3e1f8a
children 7cdd2a7db2c2 e95f0f70c3fd
line wrap: on
line source

hg: config error at .../t/.hg/hgrc:1: 'invalid'
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
[paths]
default = .../foo%bar
default = .../foo%bar
bundle.mainreporoot=.../foobar
defaults.backout=-d "0 0"
defaults.commit=-d "0 0"
defaults.tag=-d "0 0"
paths.default=.../foo%bar
ui.slash=True
hg: config error at $HGRCPATH:8: '  x = y'