Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-committer.out @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents 5c5d23d93447
children
line wrap: on
line source

changeset:   0:9426b370c206
tag:         tip
user:        My Name <myname@example.com>
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     commit-1

changeset:   1:4997f15a1b24
tag:         tip
user:        foo@bar.com
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     commit-1

changeset:   2:72b8012b424e
tag:         tip
user:        foobar <foo@bar.com>
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     commit-1

changeset:   3:35ff3067bedd
tag:         tip
user:        foo@bar.com
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     commit-1

transaction abort!
rollback completed
abort: Please specify a username.
No username found, using user@host instead