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

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

subrepo: change default path in hgrc of subrepo after cloning...
subrepo: change default path in hgrc of subrepo after cloning Previous behavior was to put in the cloned subrepos the path found in the original main repo. However it isn't valid for relative path and it seems more logical to reference instead the subrepos working copy path of the original main repo.
Benoit Boissinot - - Load All Authors

File last commit:

r10355:a5576908 default
r10378:e1401c74 default
Show More
test-merge-default.out
36 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
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
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
created new head
% 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)