Mercurial > hg
view tests/test-manifest-merging.out @ 9960:652064640e98
test blacklist: add inotify-failures target
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Sat, 28 Nov 2009 11:21:19 +0900 |
parents | a3d73b3e1f8a |
children |
line wrap: on
line source
% init foo-base % create alpha in first repo adding alpha % clone foo-base to foo-work updating to branch default 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