Mercurial > hg
view tests/test-hgrc.out @ 9954:d6a307719ccb stable
fix bug in prepush logic involving merge changesets
When creating new branches and merging them into existing ones, you would
sometimes be able to push some changesets (the existing branches) without using
--force, even when that creates a new head on the remote.
A test which triggers the error has been added.
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Mon, 30 Nov 2009 14:58:52 +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'