tests/test-manifest-merging.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 09 Feb 2007 03:48:28 -0200
changeset 4070 961ccb615cf7
parent 3352 be8efb6e1cc6
permissions -rw-r--r--
Handle functions as the value of a hooks.<name> config variable This should make it easier for extensions to add a hook when they're loaded.

% 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