Mercurial > hg
view tests/test-manifest-merging.out @ 4561:a73d80d6385a
Revive commands.dispatch as a simple way to call hg from other pythons scripts.
This was already used by hg-ssh and others and is really convenient if you
just want a native equivalent of calling the command line version.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 12 Jun 2007 17:39:57 +0200 |
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