##// 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.
Matt Mackall - - Load All Authors

File last commit:

r6736:369ddc9c default
r10378:e1401c74 default
Show More
test-merge-remove.out
35 lines | 673 B | text/plain | TextLexer
/ tests / test-merge-remove.out
History | Source | Raw |Copy content |Copy permalink
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Matt Mackall
merge: introduce mergestate
 r6512 merging foo1 and foo to foo1
Alexis S. L. Carvalho
dirstate.remove: during merges, remember the previous file state...
 r6297 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
n 0 -2 bar
m 644 14 foo1
copy: foo -> foo1
M bar
M foo1
% removing foo1 and bar
r 0 -2 bar
r 0 -1 foo1
copy: foo -> foo1
R bar
R foo1
Alexis S. L. Carvalho
normallookup: during merges, restore the state saved by remove
 r6298 % readding foo1 and bar
adding bar
adding foo1
n 0 -2 bar
m 644 14 foo1
copy: foo -> foo1
M bar
M foo1
foo
Alexis S. L. Carvalho
revert: update state of files in the "checkout" list...
 r6299 % reverting foo1 and bar
saving current version of bar as bar.orig
reverting bar
saving current version of foo1 as foo1.orig
reverting foo1
n 0 -2 bar
m 644 14 foo1
copy: foo -> foo1
M bar
M foo1
foo