##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

run-tests: give each child its own tmp dir (issue1911)...
run-tests: give each child its own tmp dir (issue1911) Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel mode = fail), and also fixes the long-standing quirk that parallel mode created multiple /tmp/hgtests.XXXXXX directories. Now there is only one /tmp/hgtests.XXXXXX, with child0, child1, etc. under it.
Patrick Mezard - - Load All Authors

File last commit:

r9429:d8143769 default
r9899:be574a37 stable
Show More
test-merge-default.out
28 lines | 1.1 KiB | text/plain | TextLexer
/ tests / test-merge-default.out
History | Source | Raw |Copy content |Copy permalink
Vadim Gelfer
merge with other head by default, not tip....
 r2915 adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Vadim Gelfer
merge with other head by default, not tip....
 r2915 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Vadim Gelfer
merge with other head by default, not tip....
 r2915 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail because not at a head
Dirkjan Ochtman
merge: only in-branch merges can be implicit
 r6723 abort: branch 'default' has 3 heads - please merge with an explicit rev
Vadim Gelfer
merge with other head by default, not tip....
 r2915 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail because > 2 heads
Dirkjan Ochtman
merge: only in-branch merges can be implicit
 r6723 abort: branch 'default' has 3 heads - please merge with an explicit rev
Vadim Gelfer
merge with other head by default, not tip....
 r2915 % should succeed
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should succeed - 2 heads
Dirkjan Ochtman
merge: add -S/--show option to review revisions without merging
 r8387 changeset: 3:903c264cdf57
parent: 1:ba677d0156c1
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: d
Vadim Gelfer
merge with other head by default, not tip....
 r2915 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Benoit Boissinot
improve error message for 'hg merge' when repo already at branchtip
 r5242 % should fail because at tip
abort: there is nothing to merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
merge with other head by default, not tip....
 r2915 % should fail because 1 head
abort: there is nothing to merge - use "hg update" instead