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

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

Do not use osutil.c with python 2.4 and Windows (issue1364)...
Do not use osutil.c with python 2.4 and Windows (issue1364) Windows python 2.4 os.stat() reports times including DST offset, while osutil.c reports the correct value, which makes status() systematically compare files content. This bug is fixed in python 2.5. Using osutil.py instead of osutil.c is 4x times slower on large repositories but current code is completely unusable. Given few people are likely to use python 2.4 on Windows this solution was considered a good trade-off compared to more invasive solutions trying to address the offset issue.
Adrian Buehlmann - - Load All Authors

File last commit:

r9611:a3d73b3e default
r10521:bde1bb25 stable
Show More
test-mq-pull-from-bundle.out
59 lines | 1.6 KiB | text/plain | TextLexer
/ tests / test-mq-pull-from-bundle.out
History | Source | Raw |Copy content |Copy permalink
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 ====== Setup main
adding one
====== Bundle main
Thomas Arendsen Hein
Show number of changesets written to bundle files by default (issue569)...
 r5763 2 changesets found
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 ====== Incoming to fresh repo
>> hg -R fresh incoming main.hg
comparing with main.hg
0: main: one added.
1: main: one updated.
>> hg -R fresh incoming bundle:fresh+main.hg
comparing with bundle:fresh+main.hg
0: main: one added.
1: main: one updated.
====== Setup queue
adding two
Mads Kiilerich
mq: qpop now tells which patches are popped...
 r9110 popping two.patch
Martin Geisler
mq: lowercase output...
 r7627 patch queue now empty
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 ====== Bundle queue
Thomas Arendsen Hein
Show number of changesets written to bundle files by default (issue569)...
 r5763 1 changesets found
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 ====== Clone base
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
====== Incoming queue bundle
>> hg -R .hg/patches incoming ../queue.hgq
comparing with ../queue.hgq
0: queue: two.patch added.
====== Pull queue bundle
>> hg -R .hg/patches pull --update ../queue.hgq
pulling from ../queue.hgq
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
merging series
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
>> hg -R .hg/patches heads
0: queue: two.patch added.
>> hg -R .hg/patches log
0: queue: two.patch added.
>> hg qseries
two.patch
====== Clone base again
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
====== Unbundle queue bundle
>> hg -R .hg/patches unbundle --update ../queue.hgq
adding changesets
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
merging series
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
>> hg -R .hg/patches heads
0: queue: two.patch added.
>> hg -R .hg/patches log
0: queue: two.patch added.
>> hg qseries
two.patch