Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-convert-baz.out
author Greg Ward <greg-hg@gerg.ca>
Wed, 18 Mar 2009 09:15:38 -0400
changeset 7862 02981000012e
parent 7567 0946294d1f32
child 10576 7616ff5f3596
permissions -rw-r--r--
cvsps: recognize and eliminate CVS' synthetic "file added" revisions.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6078
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
     1
 
% create baz archive
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
     2
 
% initialize baz repo
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
     3
 
* creating version baz@mercurial--convert/baz--test--0
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
     4
 
* imported baz@mercurial--convert/baz--test--0
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
     5
 
% create initial files
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
     6
 
* build pristine tree for baz@mercurial--convert/baz--test--0--base-0
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
     7
 
* Scanning for full-tree revision: .
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
     8
 
* from import revision: baz@mercurial--convert/baz--test--0--base-0
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
     9
 
A/ .arch-ids
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    10
 
A/ src
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    11
 
A/ src/.arch-ids
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    12
 
A  .arch-ids/a.id
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    13
 
A  a
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    14
 
A  src/.arch-ids/=id
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    15
 
A  src/.arch-ids/b.id
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    16
 
A  src/b
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    17
 
* update pristine tree (baz@mercurial--convert/baz--test--0--base-0 => baz--test--0--patch-1)
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    18
 
* committed baz@mercurial--convert/baz--test--0--patch-1
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    19
 
% create link file and modify a
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    20
 
A  src/.arch-ids/a-link.id
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    21
 
A  src/a-link
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    22
 
M  a
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    23
 
* update pristine tree (baz@mercurial--convert/baz--test--0--patch-1 => baz--test--0--patch-2)
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    24
 
* committed baz@mercurial--convert/baz--test--0--patch-2
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    25
 
% create second link and modify b
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    26
 
A  src/.arch-ids/a-link-2.id
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    27
 
A  src/a-link-2
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    28
 
Mb src/b
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    29
 
* update pristine tree (baz@mercurial--convert/baz--test--0--patch-2 => baz--test--0--patch-3)
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    30
 
* committed baz@mercurial--convert/baz--test--0--patch-3
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    31
 
% b file to link and a-link-2 to regular file
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    32
 
fl src/b
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    33
 
lf src/a-link-2
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    34
 
* update pristine tree (baz@mercurial--convert/baz--test--0--patch-3 => baz--test--0--patch-4)
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    35
 
* committed baz@mercurial--convert/baz--test--0--patch-4
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    36
 
% move a-link-2 file and src directory
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    37
 
D/ src/.arch-ids
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    38
 
A/ test/.arch-ids
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    39
 
/> src	test
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    40
 
=> src/.arch-ids/a-link-2.id	.arch-ids/c.id
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    41
 
=> src/a-link-2	c
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    42
 
=> src/.arch-ids/=id	test/.arch-ids/=id
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    43
 
=> src/.arch-ids/a-link.id	test/.arch-ids/a-link.id
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    44
 
=> src/.arch-ids/b.id	test/.arch-ids/b.id
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    45
 
* update pristine tree (baz@mercurial--convert/baz--test--0--patch-4 => baz--test--0--patch-5)
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    46
 
* committed baz@mercurial--convert/baz--test--0--patch-5
7567
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    47
 
% move and add the moved file again
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    48
 
A  .arch-ids/e.id
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    49
 
A  e
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    50
 
* update pristine tree (baz@mercurial--convert/baz--test--0--patch-5 => baz--test--0--patch-6)
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    51
 
* committed baz@mercurial--convert/baz--test--0--patch-6
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    52
 
A  .arch-ids/e.id
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    53
 
A  e
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    54
 
=> .arch-ids/e.id	.arch-ids/f.id
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    55
 
=> e	f
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    56
 
* update pristine tree (baz@mercurial--convert/baz--test--0--patch-6 => baz--test--0--patch-7)
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    57
 
* committed baz@mercurial--convert/baz--test--0--patch-7
6078
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    58
 
% converting baz repo to Mercurial
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    59
 
initializing destination baz-repo-hg repository
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    60
 
analyzing tree version baz@mercurial--convert/baz--test--0...
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    61
 
scanning source...
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    62
 
sorting...
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    63
 
converting...
7567
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    64
 
7 initial import
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    65
 
6 added a file, src and src/b (binary)
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    66
 
5 added link to a and modify a
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    67
 
4 added second link and modify b
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    68
 
3 file to link and link to file test
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    69
 
2 move and rename a-link-2 file and src directory
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    70
 
1 add e
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    71
 
0 move e and recreate it again
6078
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    72
 
% show graph log
7567
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    73
 
o  7 "move e and recreate it again" files: e f
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    74
 
|
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    75
 
o  6 "add e" files: e
0946294d1f32 convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents: 6078
diff changeset 
    76
 
|
6078
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    77
 
o  5 "move and rename a-link-2 file and src directory" files: c src/a-link src/a-link-2 src/b test/a-link test/b
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    78
 
|
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    79
 
o  4 "file to link and link to file test" files: src/a-link-2 src/b
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    80
 
|
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    81
 
o  3 "added second link and modify b" files: src/a-link-2 src/b
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    82
 
|
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    83
 
o  2 "added link to a and modify a" files: a src/a-link
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    84
 
|
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    85
 
o  1 "added a file, src and src/b (binary)" files: a src/b
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    86
 
|
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    87
 
o  0 "initial import" files:
ebc23d34102f convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff changeset 
    88
 












ebc23d34102f
convert: added gnu arch (baz) tests



Aleix Conchillo Flaque <aleix@member.fsf.org>


parents: 

diff
changeset




    89


c4072c4b72e1cabace081888efa148ee80ca3cbb 644   a







7567






0946294d1f32
convert/gnuarch: fix switched copy source and destination



Patrick Mezard <pmezard@gmail.com>


parents: 
6078

diff
changeset




    90


623942606de842342ac7b221ae9ccabc13b5d8c8 644   c












0946294d1f32
convert/gnuarch: fix switched copy source and destination



Patrick Mezard <pmezard@gmail.com>


parents: 
6078

diff
changeset




    91


1a4a864db0073705a11b1439f563bfa4b46d9246 644   e












0946294d1f32
convert/gnuarch: fix switched copy source and destination



Patrick Mezard <pmezard@gmail.com>


parents: 
6078

diff
changeset




    92


ab9089704d7c988687521e6adf018ebf767da7d6 644   f












0946294d1f32
convert/gnuarch: fix switched copy source and destination



Patrick Mezard <pmezard@gmail.com>


parents: 
6078

diff
changeset




    93


43b4308708a4b36340566684df2e2a074b12ceb0 644 @ test/a-link












0946294d1f32
convert/gnuarch: fix switched copy source and destination



Patrick Mezard <pmezard@gmail.com>


parents: 
6078

diff
changeset




    94


73773e3389ef7ec5a070519b74895d2eaa4ad5db 644 @ test/b












0946294d1f32
convert/gnuarch: fix switched copy source and destination



Patrick Mezard <pmezard@gmail.com>


parents: 
6078

diff
changeset




    95


copies:      c (src/a-link-2) test/a-link (src/a-link) test/b (src/b)












0946294d1f32
convert/gnuarch: fix switched copy source and destination



Patrick Mezard <pmezard@gmail.com>


parents: 
6078

diff
changeset




    96


copies:      f (e)














mercurial