Mercurial > hg
comparison tests/test-convert-filemap.out @ 6737:7239e06e58e9
context: consistently return p1 context for None
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 25 Jun 2008 17:33:51 -0500 |
| parents | 4b0c9c674707 |
| children | b1addc725998 |
comparison
equal
deleted
inserted
replaced
| 6736:369ddc9c0339 | 6737:7239e06e58e9 |
|---|---|
| 27 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo | 27 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
| 28 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux | 28 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
| 29 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd | 29 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
| 30 | 30 |
| 31 % foo: skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd | 31 % foo: skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd |
| 32 o 3 "8: change foo" files: foo | 32 @ 3 "8: change foo" files: foo |
| 33 | | 33 | |
| 34 o 2 "6: change foo baz" files: foo | 34 o 2 "6: change foo baz" files: foo |
| 35 | | 35 | |
| 36 o 1 "2: change foo" files: foo | 36 o 1 "2: change foo" files: foo |
| 37 | | 37 | |
| 38 o 0 "0: add foo baz dir/" files: foo | 38 o 0 "0: add foo baz dir/" files: foo |
| 39 | 39 |
| 40 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo | 40 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
| 41 % bar: merges are not merges anymore | 41 % bar: merges are not merges anymore |
| 42 o 4 "7: second merge; change bar" files: bar | 42 @ 4 "7: second merge; change bar" files: bar |
| 43 | | 43 | |
| 44 o 3 "5: change bar baz quux" files: bar | 44 o 3 "5: change bar baz quux" files: bar |
| 45 | | 45 | |
| 46 o 2 "4: first merge; change bar baz" files: bar | 46 o 2 "4: first merge; change bar baz" files: bar |
| 47 | | 47 | |
| 49 | | 49 | |
| 50 o 0 "1: add bar quux; copy foo to copied" files: bar | 50 o 0 "1: add bar quux; copy foo to copied" files: bar |
| 51 | 51 |
| 52 9463f52fe115e377cf2878d4fc548117211063f2 644 bar | 52 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
| 53 % baz: 1st merge is not a merge anymore; 2nd still is | 53 % baz: 1st merge is not a merge anymore; 2nd still is |
| 54 o 4 "7: second merge; change bar" files: baz | 54 @ 4 "7: second merge; change bar" files: baz |
| 55 |\ | 55 |\ |
| 56 | o 3 "6: change foo baz" files: baz | 56 | o 3 "6: change foo baz" files: baz |
| 57 | | | 57 | | |
| 58 o | 2 "5: change bar baz quux" files: baz | 58 o | 2 "5: change bar baz quux" files: baz |
| 59 |/ | 59 |/ |
| 61 | | 61 | |
| 62 o 0 "0: add foo baz dir/" files: baz | 62 o 0 "0: add foo baz dir/" files: baz |
| 63 | 63 |
| 64 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz | 64 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz |
| 65 % foo quux: we add additional merges when they are interesting | 65 % foo quux: we add additional merges when they are interesting |
| 66 o 8 "8: change foo" files: foo | 66 @ 8 "8: change foo" files: foo |
| 67 | | 67 | |
| 68 o 7 "7: second merge; change bar" files: | 68 o 7 "7: second merge; change bar" files: |
| 69 |\ | 69 |\ |
| 70 | o 6 "6: change foo baz" files: foo | 70 | o 6 "6: change foo baz" files: foo |
| 71 | | | 71 | | |
| 82 o 0 "0: add foo baz dir/" files: foo | 82 o 0 "0: add foo baz dir/" files: foo |
| 83 | 83 |
| 84 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo | 84 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
| 85 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux | 85 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
| 86 % bar quux: partial conversion | 86 % bar quux: partial conversion |
| 87 o 1 "3: change bar quux" files: bar quux | 87 @ 1 "3: change bar quux" files: bar quux |
| 88 | | 88 | |
| 89 o 0 "1: add bar quux; copy foo to copied" files: bar quux | 89 o 0 "1: add bar quux; copy foo to copied" files: bar quux |
| 90 | 90 |
| 91 b79105bedc55102f394e90a789c9c380117c1b4a 644 bar | 91 b79105bedc55102f394e90a789c9c380117c1b4a 644 bar |
| 92 db0421cc6b685a458c8d86c7d5c004f94429ea23 644 quux | 92 db0421cc6b685a458c8d86c7d5c004f94429ea23 644 quux |
| 93 % bar quux: complete the partial conversion | 93 % bar quux: complete the partial conversion |
| 94 o 4 "7: second merge; change bar" files: bar | 94 @ 4 "7: second merge; change bar" files: bar |
| 95 | | 95 | |
| 96 o 3 "5: change bar baz quux" files: bar quux | 96 o 3 "5: change bar baz quux" files: bar quux |
| 97 | | 97 | |
| 98 o 2 "4: first merge; change bar baz" files: bar | 98 o 2 "4: first merge; change bar baz" files: bar |
| 99 | | 99 | |
| 102 o 0 "1: add bar quux; copy foo to copied" files: bar quux | 102 o 0 "1: add bar quux; copy foo to copied" files: bar quux |
| 103 | 103 |
| 104 9463f52fe115e377cf2878d4fc548117211063f2 644 bar | 104 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
| 105 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux | 105 bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
| 106 % foo: partial conversion | 106 % foo: partial conversion |
| 107 o 0 "0: add foo baz dir/" files: foo | 107 @ 0 "0: add foo baz dir/" files: foo |
| 108 | 108 |
| 109 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo | 109 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo |
| 110 % foo: complete the partial conversion | 110 % foo: complete the partial conversion |
| 111 o 3 "8: change foo" files: foo | 111 @ 3 "8: change foo" files: foo |
| 112 | | 112 | |
| 113 o 2 "6: change foo baz" files: foo | 113 o 2 "6: change foo baz" files: foo |
| 114 | | 114 | |
| 115 o 1 "2: change foo" files: foo | 115 o 1 "2: change foo" files: foo |
| 116 | | 116 | |
| 117 o 0 "0: add foo baz dir/" files: foo | 117 o 0 "0: add foo baz dir/" files: foo |
| 118 | 118 |
| 119 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo | 119 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
| 120 % copied: copied file; source not included in new repo | 120 % copied: copied file; source not included in new repo |
| 121 o 0 "1: add bar quux; copy foo to copied" files: copied | 121 @ 0 "1: add bar quux; copy foo to copied" files: copied |
| 122 | 122 |
| 123 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 copied | 123 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 copied |
| 124 copied not renamed | 124 copied not renamed |
| 125 % foo copied: copied file; source included in new repo | 125 % foo copied: copied file; source included in new repo |
| 126 o 4 "8: change foo" files: foo | 126 @ 4 "8: change foo" files: foo |
| 127 | | 127 | |
| 128 o 3 "6: change foo baz" files: foo | 128 o 3 "6: change foo baz" files: foo |
| 129 | | 129 | |
| 130 o 2 "2: change foo" files: foo | 130 o 2 "2: change foo" files: foo |
| 131 | | 131 | |
| 134 o 0 "0: add foo baz dir/" files: foo | 134 o 0 "0: add foo baz dir/" files: foo |
| 135 | 135 |
| 136 6ca237634e1f6bee1b6db94292fb44f092a25842 644 copied | 136 6ca237634e1f6bee1b6db94292fb44f092a25842 644 copied |
| 137 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo | 137 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
| 138 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd | 138 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
| 139 o 4 "8: change foo" files: foo2 | 139 @ 4 "8: change foo" files: foo2 |
| 140 | | 140 | |
| 141 o 3 "6: change foo baz" files: foo2 | 141 o 3 "6: change foo baz" files: foo2 |
| 142 | | 142 | |
| 143 o 2 "2: change foo" files: foo2 | 143 o 2 "2: change foo" files: foo2 |
| 144 | | 144 | |