Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-manifest-merging.out @ 4869:be591b740e0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle CGI SSL detection via HTTPS environment better. Some servers send on/off, 0/1, yes/no, and may be upper or lower case. This fix will handle all of those permutations. It was inspired by the detection done in in some other wsgi python web applications I looked at.
author Wesley J. Landaker <wjl@icecavern.net>
date Thu, 12 Jul 2007 13:55:20 -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