Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-manifest-merging.out @ 3897:f47afa2401a2
demandimport: ignore _hashlib and email.mime
This makes things work with Python2.5. A better fix would be to fix
demandload to use __getattribute__ to be more transparent.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 15 Dec 2006 12:38:18 -0600 |
parents | be8efb6e1cc6 |
children |
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