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

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

clone: print "updating working directory" status message...
clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
Matt Mackall - - Load All Authors

File last commit:

r5608:784eadab default
r6338:0750f111 default
Show More
test-rename-after-merge
34 lines | 450 B | text/plain | TextLexer
/ tests / test-rename-after-merge
History | Source | Raw |Copy content |Copy permalink
Patrick Mezard
Test renaming files brought by merge second parent (issue 746)
 r5318 #!/bin/sh
# Test issue 746: renaming files brought by the
# second parent of a merge was broken.
echo % create source repository
hg init t
cd t
echo a > a
hg ci -Am a
cd ..
echo % fork source repository
hg clone t t2
cd t2
echo b > b
hg ci -Am b
echo % update source repository
cd ../t
echo a >> a
hg ci -m a2
echo % merge repositories
hg pull ../t2
hg merge
Matt Mackall
copy: simplify inner copy...
 r5608 hg st
Patrick Mezard
Test renaming files brought by merge second parent (issue 746)
 r5318
echo % rename b as c
hg mv b c
hg st
echo % rename back c as b
hg mv c b
hg st