##// 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.
Matt Mackall - - Load All Authors

File last commit:

r8742:a964ab62 default
r10521:bde1bb25 stable
Show More
test-merge-local.out
65 lines | 1.6 KiB | text/plain | TextLexer
/ tests / test-merge-local.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Add instructions how to redo/finish failed merge with local working directory....
 r3869 # revision 0
adding copy
adding move
adding remove
adding unchanged
adding zzz1_merge_ok
adding zzz2_merge_bad
# revision 1
# local changes to revision 0
4 files updated, 0 files merged, 3 files removed, 0 files unresolved
--- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new last line
--- a/zzz2_merge_bad
+++ b/zzz2_merge_bad
+another last line
M zzz1_merge_ok
M zzz2_merge_bad
# local merge with bad merge tool
merging zzz1_merge_ok
merging zzz2_merge_bad
merging zzz2_merge_bad failed!
Matt Mackall
merge: allow smarter tool configuration...
 r6004 3 files updated, 1 files merged, 2 files removed, 1 files unresolved
Matt Mackall
resolve: new command...
 r6518 use 'hg resolve' to retry unresolved file merges
Matt Mackall
merge: allow merging going backwards...
 r8742 merging zzz1_merge_ok
merging zzz2_merge_bad
2 files updated, 2 files merged, 3 files removed, 0 files unresolved
Thomas Arendsen Hein
Add instructions how to redo/finish failed merge with local working directory....
 r3869 --- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
Matt Mackall
merge: allow smarter tool configuration...
 r6004 +new first line
Thomas Arendsen Hein
Add instructions how to redo/finish failed merge with local working directory....
 r3869 +new last line
--- a/zzz2_merge_bad
+++ b/zzz2_merge_bad
+another last line
M zzz1_merge_ok
M zzz2_merge_bad
# local merge with conflicts
merging zzz1_merge_ok
merging zzz2_merge_bad
Matt Mackall
merge: allow smarter tool configuration...
 r6004 warning: conflicts during merge.
Thomas Arendsen Hein
Add instructions how to redo/finish failed merge with local working directory....
 r3869 merging zzz2_merge_bad failed!
Matt Mackall
merge: fix spurious merges for copies in linear updates...
 r4416 3 files updated, 1 files merged, 2 files removed, 1 files unresolved
Matt Mackall
resolve: new command...
 r6518 use 'hg resolve' to retry unresolved file merges
Matt Mackall
merge: allow merging going backwards...
 r8742 merging zzz1_merge_ok
merging zzz2_merge_bad
2 files updated, 2 files merged, 3 files removed, 0 files unresolved
Thomas Arendsen Hein
Add instructions how to redo/finish failed merge with local working directory....
 r3869 --- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new first line
+new last line
--- a/zzz2_merge_bad
+++ b/zzz2_merge_bad
+another last line
+=======
+new last line
M zzz1_merge_ok
M zzz2_merge_bad
# local merge without conflicts
merging zzz1_merge_ok
Matt Mackall
merge: fix spurious merges for copies in linear updates...
 r4416 4 files updated, 1 files merged, 2 files removed, 0 files unresolved
Thomas Arendsen Hein
Add instructions how to redo/finish failed merge with local working directory....
 r3869 --- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new last line
M zzz1_merge_ok
? zzz2_merge_bad.orig