##// END OF EJS Templates
document and fix findincoming...
document and fix findincoming - add documentation about what the function does, notably the fact that it updates 'base' - transform the workflow to a more simple 'if elif elif else' - do not call remote.branches if not necessary - some nodes where missing in 'base' (from what I understand, if the root of a branch is missing but one parent is present, the parent should be in 'base') - add a testcase for an incorrect outgoing that is fixed by this cset - add a testcase for an empty group bug, it needs fixing

File last commit:

r2175:b2ae81a7 default
r2339:11422943 default
Show More
test-flags.out
51 lines | 1.3 KiB | text/plain | TextLexer
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
resolving 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)
Thomas Arendsen Hein
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags....
r491 -rwxr-x---
-rwxr-x---