Mercurial > hg
view tests/test-manifest-merging.out @ 4044:78a0dd93db0b
Abort on empty username so specifying a username can be forced.
This behaviour was introduced by c3345b0f2fcd and broken by 98f2507c5551.
Added test for this.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 24 Jan 2007 23:04:51 +0100 |
parents | be8efb6e1cc6 |
children | 0750f11152fe |
line wrap: on
line source
% init foo-base % create alpha in first repo adding alpha % clone foo-base to foo-work 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % create beta in second repo adding beta % create gamma in first repo adding gamma % pull into work and merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % revert to changeset 1 to simulate a failed merge 2 files updated, 0 files merged, 0 files removed, 0 files unresolved