view tests/test-manifest-merging.out @ 4285:4fd6f7e60894

Add tests/printenv.py This is a small script that can be used as a hook to print the HG_* environment variables without relying on the shell.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 26 Mar 2007 23:49:56 -0300
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