Mercurial > hg

view tests/test-committer.out @ 9815:49efeed49c94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: make sure the newancestor is used during the whole update (issue1561) Before this change, newancestor was used only once as a replacement for ancestor.ancestor, but merge.update calls ancestor.ancestor several times, so it ends up with the "wrong" ancestor (the real ancestor, but we want the parent of the rebased changeset for all but the first rebased changeset). Added a new test case for this: test-rebase-newancestor. Also, in one scenario in test-rebase-collapse, there was a spurious conflict caused by the same issue, so that test case was fixed by removing the now unneeded conflict resolution and the output was adapted accordingly.
author Christian Boos <cboos@bct-technology.com>
date Mon, 09 Nov 2009 20:15:49 +0100
parents 951730b2b8ba
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

abort: no username supplied (see "hg help config")
No username found, using user@host instead
transaction abort!
rollback completed
abort: empty username!