##// END OF EJS Templates
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

File last commit:

r6254:3667b6e4 default
r6338:0750f111 default
Show More
test-convert-git.out
90 lines | 2.0 KiB | text/plain | TextLexer
/ tests / test-convert-git.out
Patrick Mezard
Test mercurial convert sink removes empty directories.
r5345 rm 'd/b'
Patrick Mezard
Test git repository conversion
r5219 assuming destination git-repo-hg
initializing destination git-repo-hg repository
scanning source...
sorting...
converting...
Patrick Mezard
Test mercurial convert sink removes empty directories.
r5345 5 t1
4 t2
3 t3
2 t4.1
1 t4.2
Alexis S. L. Carvalho
convert_git: avoid returning two entries for the same file in getchanges...
r5335 0 Merge branch other
Alexis S. L. Carvalho
localrepo.commit: normalize commit message even for rawcommit....
r6254 changeset: 5:4ab1af49a271
Alexis S. L. Carvalho
convert_git: avoid returning two entries for the same file in getchanges...
r5335 tag: tip
Alexis S. L. Carvalho
localrepo.commit: normalize commit message even for rawcommit....
r6254 parent: 3:0222ab0998d7
parent: 4:5333c870e3c2
Alexis S. L. Carvalho
convert_git: avoid returning two entries for the same file in getchanges...
r5335 user: test <test@example.org>
Patrick Mezard
Test mercurial convert sink removes empty directories.
r5345 date: Mon Jan 01 00:00:15 2007 +0000
Alexis S. L. Carvalho
convert_git: avoid returning two entries for the same file in getchanges...
r5335 files: a
description:
Merge branch other
committer: test <test@example.org>
Alexis S. L. Carvalho
convert_git: add --filemap support
r5380 % full conversion
o 9 "Discard change to foo" files: foo
|\
| o 8 "change foo" files: foo
| |
o | 7 "change bar" files: bar
|/
o 6 "(octopus merge fixup)" files:
|\
| o 5 "Octopus merge" files: baz
| |\
o | | 4 "add baz" files: baz
| | |
+---o 3 "add bar" files: bar
| |
o | 2 "add quux" files: quux
| |
| o 1 "change foo" files: foo
|/
o 0 "add foo" files: foo
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 245a3b8bc653999c2b22cdabd517ccb47aecafdf 644 bar
354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz
9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo
88dfeab657e8cf2cef3dec67b914f49791ae76b1 644 quux
Alexis S. L. Carvalho
convert_git: add --filemap support
r5380 % foo bar baz: octopus merge
o 8 "Discard change to foo" files: foo
|\
| o 7 "change foo" files: foo
| |
o | 6 "change bar" files: bar
|/
o 5 "(octopus merge fixup)" files:
|\
| o 4 "Octopus merge" files: baz
| |\
o | | 3 "add baz" files: baz
| | |
+---o 2 "add bar" files: bar
| |
| o 1 "change foo" files: foo
|/
o 0 "add foo" files: foo
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 245a3b8bc653999c2b22cdabd517ccb47aecafdf 644 bar
354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz
9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo
Alexis S. L. Carvalho
convert_git: add --filemap support
r5380 % foo baz quux: only some parents of an octopus merge; "discard" a head
o 6 "Discard change to foo" files: foo
|
o 5 "change foo" files: foo
|
o 4 "Octopus merge" files:
|\
| o 3 "add baz" files: baz
| |
| o 2 "add quux" files: quux
| |
o | 1 "change foo" files: foo
|/
o 0 "add foo" files: foo
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 354ae8da6e890359ef49ade27b68bbc361f3ca88 644 baz
9277c9cc8dd4576fc01a17939b4351e5ada93466 644 foo
88dfeab657e8cf2cef3dec67b914f49791ae76b1 644 quux