Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 2015:1a09814a5b1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Catch HTTPException when reading from remote http repository. If the server dies very early, an httplib.IncompleteRead exception may be raised, because httplib can't read a single byte. Catching all HTTPException subclasses here will prevent ugly backtraces for similar things, too.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 29 Mar 2006 12:45:33 +0200
parents 2da2d46862fb
children b2ae81a7df29
line wrap: on
line source

%% no merges expected
%% merge should fail
abort: 'b' already exists in the working dir and differs from remote
%% merge of b expected
merging for b
merging b
%%
Contents of b should be "this is file b1"
This is file b1
%% merge fails
abort: outstanding uncommitted changes
%% merge expected!
merging for b
merging b
%% merge of b should fail
abort: outstanding uncommitted changes
%% merge of b expected
merging for b
merging b