Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.out @ 3064:fbd3f9fd645d
hgk.py: use mercurial.patch functions when possible
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Thu, 07 Sep 2006 14:13:01 +0200 |
parents | a31557193f3c |
children | 966632304dde 49966b5ab16f |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved %% no merges expected merging for b merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved %% merge should fail abort: 'b' already exists in the working dir and differs from remote %% merge of b expected merging for b merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) %% 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 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 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved %% merge of b should fail abort: outstanding uncommitted changes %% merge of b expected merging for b merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)