##// END OF EJS Templates
convert/bzr: make it work with filemaps (issue1631)...
convert/bzr: make it work with filemaps (issue1631) The bzr converter maintains a child -> parents mapping and drop entries whenever a child is read. It does not work with filemaps, getchangedfiles() may be called more than once when filtered files belong to merge revisions. getchanges() still works that way but it is not clear whether a similar issue can arise when interacting with merges.

File last commit:

r6338:0750f111 default
r8165:78658990 default
Show More
test-flags.out
100 lines | 2.9 KiB | text/plain | TextLexer
Adrian Buehlmann
clone: print "updating working directory" status message...
r6338 updating working directory
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
Alexis S. L. Carvalho
Make sure the changelog mentions files whose flags changed...
r4530 % the changelog should mention file a:
a
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
Alexis S. L. Carvalho
Avoid extra filelogs entries....
r4531 added 1 changesets with 0 changes to 0 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)
Alexis S. L. Carvalho
Avoid extra filelogs entries....
r4531 changeset: 2:37dccb76c058
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
Alexis S. L. Carvalho
Avoid extra filelogs entries....
r4531 changeset: 2:37dccb76c058
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
Alexis S. L. Carvalho
Avoid extra filelogs entries....
r4531 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Benoit Boissinot
ui: output the number of file updated/merged/removed/... on update...
r1922 (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
Alexis S. L. Carvalho
Avoid extra filelogs entries....
r4531 added 1 changesets with 0 changes to 0 files (+1 heads)
Benoit Boissinot
extend test-flags
r3321 (run 'hg heads' to see heads, 'hg merge' to merge)
Alexis S. L. Carvalho
Avoid extra filelogs entries....
r4531 changeset: 2:37dccb76c058
Benoit Boissinot
extend test-flags
r3321 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
Alexis S. L. Carvalho
Avoid extra filelogs entries....
r4531 changeset: 2:37dccb76c058
Benoit Boissinot
extend test-flags
r3321 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
Alexis S. L. Carvalho
Avoid extra filelogs entries....
r4531 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Benoit Boissinot
extend test-flags
r3321 (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
rev offset length base linkrev nodeid p1 p2
0 0 0 0 0 b80de5d13875 000000000000 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