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

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

Merge with crew-stable
Merge with crew-stable
Thomas Arendsen Hein - - Load All Authors

File last commit:

r3323:b7a46cbf merge default
r4134:9dc64c84 merge default
Show More
test-flags.out
102 lines | 3.1 KiB | text/plain | TextLexer
/ tests / test-flags.out
History | Source | Raw |Copy content |Copy permalink
Benoit Boissinot
extend test-flags
 r3321 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
 r412 pulling from ../test1
requesting all changes
adding changesets
adding manifests
mpm@selenic.com
Fix up test results...
 r775 adding file changes
added 1 changesets with 2 changes to 2 files
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
 r412 (run 'hg update' to get a working copy)
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
 r412 pulling from ../test2
searching for changes
adding changesets
adding manifests
mpm@selenic.com
Fix up test results...
 r775 adding file changes
mpm@selenic.com
Update tests
 r1043 added 1 changesets with 1 changes to 1 files (+1 heads)
Vadim Gelfer
add merge command. means same thing as "update -m"....
 r2019 (run 'hg heads' to see heads, 'hg merge' to merge)
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 changeset: 2:b833d578451e
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
 r412 tag: tip
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 parent: 0:4536b1c2ca69
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
 r412 user: test
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 date: Mon Jan 12 13:46:40 1970 +0000
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
 r412 summary: chmod +x a
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 changeset: 1:a187cb361a5a
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
 r412 user: test
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 date: Mon Jan 12 13:46:40 1970 +0000
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
 r412 summary: a updated
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 changeset: 2:b833d578451e
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
 r412 tag: tip
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 parent: 0:4536b1c2ca69
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
 r412 user: test
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 date: Mon Jan 12 13:46:40 1970 +0000
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
 r412 summary: chmod +x a
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 changeset: 1:a187cb361a5a
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
 r412 user: test
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 date: Mon Jan 12 13:46:40 1970 +0000
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
 r412 summary: a updated
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 changeset: 0:4536b1c2ca69
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
 r412 user: test
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 date: Mon Jan 12 13:46:40 1970 +0000
mpm@selenic.com
[PATCH]: Typo in localrepository.update...
 r412 summary: added a b
resolving manifests
merging a
Benoit Boissinot
ui: output the number of file updated/merged/removed/... on update...
 r1922 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Benoit Boissinot
extend test-flags
 r3321 pulling from ../test2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
changeset: 2:b833d578451e
tag: tip
parent: 0:4536b1c2ca69
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: chmod +x a
changeset: 1:d54568174d8e
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: b updated
changeset: 2:b833d578451e
tag: tip
parent: 0:4536b1c2ca69
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: chmod +x a
changeset: 1:d54568174d8e
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: b updated
changeset: 0:4536b1c2ca69
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: added a b
resolving manifests
getting a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Thomas Arendsen Hein
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags....
 r491 -rwxr-x---
-rwxr-x---
Benoit Boissinot
extend test-flags
 r3321 -rwxr-x---
rev offset length base linkrev nodeid p1 p2
0 0 0 0 0 b80de5d13875 000000000000 000000000000
1 0 0 0 2 37c42bd6cc03 b80de5d13875 000000000000
rev offset length base linkrev nodeid p1 p2
0 0 0 0 0 b80de5d13875 000000000000 000000000000
1 0 0 0 1 37c42bd6cc03 b80de5d13875 000000000000
rev offset length base linkrev nodeid p1 p2
0 0 0 0 0 b80de5d13875 000000000000 000000000000
1 0 5 1 1 7fe919cc0336 b80de5d13875 000000000000
2 5 0 2 2 37c42bd6cc03 b80de5d13875 000000000000