Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1977:7eb694a1c1af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't forget version at the end of setup.py, write it only if changed. This fixes issue159: "python setup.py install" shouldn't write new files in the working dir if one has done "python setup.py build" first.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 19 Mar 2006 21:26:58 +0100
parents db10b7114de0
children 2da2d46862fb
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 uncommited changes
%% merge expected!
merging for b
merging b
%% merge of b should fail
abort: outstanding uncommited changes
%% merge of b expected
merging for b
merging b