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

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

color: add win32 support for non-black background...
color: add win32 support for non-black background This complicates the code a bit, since attributes need to be masked together correctly before they are applied. Perhaps the code should be redesigned at some point, but this works well for now.
Matt Mackall - - Load All Authors

File last commit:

r11173:5b48d819 default
r12277:a7d3147b stable
Show More
test-merge-default.out
40 lines | 1.5 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
Benoit Boissinot
merge: add hints about the use of 'hg heads' to find the rev to merge
 r10355 (run 'hg heads .' to see heads)
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
Benoit Boissinot
merge: add hints about the use of 'hg heads' to find the rev to merge
 r10355 (run 'hg heads .' to see heads)
Vadim Gelfer
merge with other head by default, not tip....
 r2915 % should succeed
Greg Ward
test-merge-default: make content of test repo clearer....
 r10504 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
merge with other head by default, not tip....
 r2915 (branch merge, don't forget to commit)
% should succeed - 2 heads
Greg Ward
test-merge-default: make content of test repo clearer....
 r10504 changeset: 3:ea9ff125ff88
parent: 1:1846eede8b68
Dirkjan Ochtman
merge: add -S/--show option to review revisions without merging
 r8387 user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: d
Greg Ward
test-merge-default: make content of test repo clearer....
 r10504 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
merge with other head by default, not tip....
 r2915 (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
Benoit Boissinot
merge: add hints about the use of 'hg heads' to find the rev to merge
 r10355 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
marked working directory as branch foobranch
% should fail because merge with other branch
abort: branch 'foobranch' has one head - please merge with an explicit rev
(run 'hg heads' to see all heads)
Greg Ward
merge: fix --preview to show all nodes that will be merged (issue2043)....
 r10505 % merge preview not affected by common ancestor
2:2d95304fed5d
4:f25cbe84d8b3
5:a431fabd6039
6:e88e33f3bf62