##// 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.
Greg Ward - - Load All Authors

File last commit:

r8821:c66e324d default
r10521:bde1bb25 stable
Show More
test-convert-cvsnt-mergepoints.out
140 lines | 2.6 KiB | text/plain | TextLexer
/ tests / test-convert-cvsnt-mergepoints.out
History | Source | Raw |Copy content |Copy permalink
Greg Ward
Rename CVSNT "mergepoints" test and make it executable....
 r8818 % create cvs repository
Greg Ward
test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12....
 r8819 cvs -f -Q -d *REPO* init
% checkout #1: add foo.txt
cvs -f -Q checkout -d cvsworktmp .
cvs -f -Q add foo
cvs -f -Q add foo.txt
Greg Ward
Fix test-convert-cvsnt-mergepoints so it works reliably....
 r8821 cvs -f ci -f -m add foo.txt foo.txt
Greg Ward
Rename CVSNT "mergepoints" test and make it executable....
 r8818 initial revision: 1.1
Greg Ward
test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12....
 r8819 % checkout #2: create MYBRANCH1 and modify foo.txt on it
cvs -f -Q checkout -d cvswork foo
cvs -f -q rtag -b -R MYBRANCH1 foo
cvs -f -Q update -P -r MYBRANCH1
Greg Ward
Fix test-convert-cvsnt-mergepoints so it works reliably....
 r8821 cvs -f ci -f -m bar foo.txt
Greg Ward
Rename CVSNT "mergepoints" test and make it executable....
 r8818 new revision: 1.1.2.1; previous revision: 1.1
Greg Ward
Fix test-convert-cvsnt-mergepoints so it works reliably....
 r8821 cvs -f ci -f -m baz foo.txt
Greg Ward
Rename CVSNT "mergepoints" test and make it executable....
 r8818 new revision: 1.1.2.2; previous revision: 1.1.2.1
Greg Ward
test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12....
 r8819 % create MYBRANCH1_2 and modify foo.txt some more
cvs -f -q rtag -b -R -r MYBRANCH1 MYBRANCH1_2 foo
cvs -f -Q update -P -r MYBRANCH1_2
Greg Ward
Fix test-convert-cvsnt-mergepoints so it works reliably....
 r8821 cvs -f ci -f -m bazzie foo.txt
Greg Ward
Rename CVSNT "mergepoints" test and make it executable....
 r8818 new revision: 1.1.2.2.2.1; previous revision: 1.1.2.2
Greg Ward
test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12....
 r8819 % create MYBRANCH1_1 and modify foo.txt yet again
cvs -f -q rtag -b -R MYBRANCH1_1 foo
cvs -f -Q update -P -r MYBRANCH1_1
Greg Ward
Fix test-convert-cvsnt-mergepoints so it works reliably....
 r8821 cvs -f ci -f -m quux foo.txt
Greg Ward
Rename CVSNT "mergepoints" test and make it executable....
 r8818 new revision: 1.1.4.1; previous revision: 1.1
Greg Ward
test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12....
 r8819 % merge MYBRANCH1 to MYBRANCH1_1
Greg Ward
Rename CVSNT "mergepoints" test and make it executable....
 r8818 rcsmerge: warning: conflicts during merge
Greg Ward
test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12....
 r8819 cvs -f -Q update -P -jMYBRANCH1
RCS file: *REPO*/foo/foo.txt,v
Greg Ward
Rename CVSNT "mergepoints" test and make it executable....
 r8818 retrieving revision 1.1
retrieving revision 1.1.2.2
Merging differences between 1.1 and 1.1.2.2 into foo.txt
Greg Ward
Fix test-convert-cvsnt-mergepoints so it works reliably....
 r8821 cvs -f ci -f -m merge1+clobber foo.txt
Greg Ward
Rename CVSNT "mergepoints" test and make it executable....
 r8818 new revision: 1.1.4.2; previous revision: 1.1.4.1
Greg Ward
test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12....
 r8819 % return to trunk and merge MYBRANCH1_2
cvs -f -Q update -P -A
cvs -f -Q update -P -jMYBRANCH1_2
RCS file: *REPO*/foo/foo.txt,v
Greg Ward
Rename CVSNT "mergepoints" test and make it executable....
 r8818 retrieving revision 1.1
retrieving revision 1.1.2.2.2.1
Merging differences between 1.1 and 1.1.2.2.2.1 into foo.txt
Greg Ward
Fix test-convert-cvsnt-mergepoints so it works reliably....
 r8821 cvs -f ci -f -m merge2 foo.txt
Greg Ward
Rename CVSNT "mergepoints" test and make it executable....
 r8818 new revision: 1.2; previous revision: 1.1
collecting CVS rlog
7 log entries
creating changesets
7 changeset entries
---------------------
PatchSet 1
Date:
Author:
Branch: HEAD
Tag: (none)
Branchpoints: MYBRANCH1_1, MYBRANCH1
Log:
foo.txt
Members:
foo.txt:INITIAL->1.1
---------------------
PatchSet 2
Date:
Author:
Branch: MYBRANCH1
Tag: (none)
Parent: 1
Log:
bar
Members:
foo.txt:1.1->1.1.2.1
---------------------
PatchSet 3
Date:
Author:
Branch: MYBRANCH1
Tag: (none)
Branchpoints: MYBRANCH1_2
Parent: 2
Log:
baz
Members:
foo.txt:1.1.2.1->1.1.2.2
---------------------
PatchSet 4
Date:
Author:
Branch: MYBRANCH1_1
Tag: (none)
Parent: 1
Log:
quux
Members:
foo.txt:1.1->1.1.4.1
---------------------
PatchSet 5
Date:
Author:
Branch: MYBRANCH1_2
Tag: (none)
Parent: 3
Log:
bazzie
Members:
foo.txt:1.1.2.2->1.1.2.2.2.1
---------------------
PatchSet 6
Date:
Author:
Branch: HEAD
Tag: (none)
Parents: 1,5
Log:
merge
Members:
foo.txt:1.1->1.2
---------------------
PatchSet 7
Date:
Author:
Branch: MYBRANCH1_1
Tag: (none)
Parents: 4,3
Log:
merge
Members:
foo.txt:1.1.4.1->1.1.4.2