##// 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.
Adrian Buehlmann - - Load All Authors

File last commit:

r9611:a3d73b3e default
r10378:e1401c74 default
Show More
test-pull-update.out
32 lines | 967 B | text/plain | TextLexer
/ tests / test-pull-update.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Update on pull -u when heads were closed (fixes issue666)....
 r5080 adding foo
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Thomas Arendsen Hein
Update on pull -u when heads were closed (fixes issue666)....
 r5080 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail
pulling from ../tt
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
not updating, since new heads added
(run 'hg heads' to see heads, 'hg merge' to merge)
% should fail
pulling from ../t
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
not updating, since new heads added
(run 'hg heads' to see heads, 'hg merge' to merge)
merging foo
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should work
pulling from ../tt
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (-1 heads)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved