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

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

ui: refactor option setting...
ui: refactor option setting No more passing options as constructor keywords. Basic options are now always stored in the overlay for simplicity and consistency.
Benoit Boissinot - - Load All Authors

File last commit:

r8082:81aba9e7 merge default
r8136:6b5522cb default
Show More
test-convert-cvs-synthetic.out
57 lines | 1.3 KiB | text/plain | TextLexer
/ tests / test-convert-cvs-synthetic.out
History | Source | Raw |Copy content |Copy permalink
Greg Ward
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
 r7862 % create cvs repository with one project
Greg Ward
issue1577: fix broken test by assuming less about CVS output....
 r8081 cvs -f -d *REPO* init
cvs -f -q co proj
Greg Ward
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
 r7862 % create file1 on the trunk
Greg Ward
issue1577: fix broken test by assuming less about CVS output....
 r8081 cvs -f -Q add file1
cvs -f ci -madd file1 on trunk file1
Greg Ward
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
 r7862 % create two branches
Greg Ward
issue1577: fix broken test by assuming less about CVS output....
 r8081 cvs -f -q tag -b v1_0
Greg Ward
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
 r7862 T file1
Greg Ward
issue1577: fix broken test by assuming less about CVS output....
 r8081 cvs -f -q tag -b v1_1
Greg Ward
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
 r7862 T file1
% create file2 on branch v1_0
Greg Ward
issue1577: fix broken test by assuming less about CVS output....
 r8081 cvs -f -q up -rv1_0
cvs -f -Q add file2
cvs -f ci -madd file2 on branch v1_0 file2
Greg Ward
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
 r7862 % create file3, file4 on branch v1_1
Greg Ward
issue1577: fix broken test by assuming less about CVS output....
 r8081 cvs -f -Q up -rv1_1
cvs -f -Q add file3 file4
cvs -f ci -madd file3, file4 on branch v1_1 file3 file4
Greg Ward
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
 r7862 % merge file2 from v1_0 to v1_1
Greg Ward
issue1577: fix broken test by assuming less about CVS output....
 r8081 cvs -f -q up -jv1_0
Greg Ward
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
 r7862 U file2
Greg Ward
issue1577: fix broken test by assuming less about CVS output....
 r8081 cvs -f ci -mmerge file2 from v1_0 to v1_1
% cvs rlog output
RCS file: *REPO*/proj/file1,v
revision 1.1
RCS file: *REPO*/proj/Attic/file2,v
revision 1.1
revision 1.1.4.2
revision 1.1.4.1
revision 1.1.2.1
RCS file: *REPO*/proj/Attic/file3,v
revision 1.1
revision 1.1.2.1
RCS file: *REPO*/proj/Attic/file4,v
revision 1.1
revision 1.1.2.1
Greg Ward
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
 r7862 % convert to hg
initializing destination proj.hg repository
Patrick Mezard
convert/cvs: delay CVS log parsing after initialization (issue1581/2)...
 r8048 connecting to *REPO*
scanning source...
Greg Ward
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
 r7862 using builtin cvsps
collecting CVS rlog
9 log entries
creating changesets
4 changeset entries
sorting...
converting...
3 add file1 on trunk
2 add file2 on branch v1_0
1 add file3, file4 on branch v1_1
0 merge file2 from v1_0 to v1_1
% hg log output
3 merge file2 from v1_0 to v1_1
2 add file3, file4 on branch v1_1
1 add file2 on branch v1_0
0 add file1 on trunk