Mercurial > hg

annotate tests/test-convert-svn-tags.out @ 11715:4f9dfb54c8b5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qpush --move: move the right patch even with comment lines 88fc876a4833 caused that we find the index of the moving patch in self.series but look it up in self.full_series. The difference between these is that full_series also contains comment lines, and we thus moved the wrong patch. Use back self.full_series to find the moving patch, but take care of striping the patch guard markers before comparing the patch name. Test cases have been added for comments and empty lines in self.full_series, and for the case of guarded patches. Original patch contributed by Mads Kiilerich <mads@kiilerich.com>
author Gilles Moris <gilles.moris@free.fr>
date Sat, 10 Jul 2010 21:23:00 +0200
parents 965b11c1bd82
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6398
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
1 % convert
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
2 initializing destination A-hg repository
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
3 scanning source...
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
4 sorting...
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
5 converting...
8246
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
6 5 init projA
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
7 4 adda
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
8 3 changea
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
9 2 changea2
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
10 1 changea3
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
11 0 changea
6398
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
12 updating tags
8246
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
13 o 6 update tags tags: tip
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
14 |
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
15 o 5 changea tags: trunk.goodtag
6398
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
16 |
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
17 o 4 changea3 tags:
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
18 |
8246
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
19 o 3 changea2 tags: trunk.v1
6398
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
20 |
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
21 o 2 changea tags:
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
22 |
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
23 o 1 adda tags:
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
24 |
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
25 o 0 init projA tags:
0e91ef0b52e7 Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
26
8246
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
27 tip 6:
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
28 trunk.goodtag 5:
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
29 trunk.v1 3:
6400
c237b27e1350 convert: allow tags detection to be disabled
Patrick Mezard <pmezard@gmail.com>
parents: 6399
diff changeset
30 % convert without tags
c237b27e1350 convert: allow tags detection to be disabled
Patrick Mezard <pmezard@gmail.com>
parents: 6399
diff changeset
31 initializing destination A-notags-hg repository
c237b27e1350 convert: allow tags detection to be disabled
Patrick Mezard <pmezard@gmail.com>
parents: 6399
diff changeset
32 scanning source...
c237b27e1350 convert: allow tags detection to be disabled
Patrick Mezard <pmezard@gmail.com>
parents: 6399
diff changeset
33 sorting...
c237b27e1350 convert: allow tags detection to be disabled
Patrick Mezard <pmezard@gmail.com>
parents: 6399
diff changeset
34 converting...
8246
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
35 5 init projA
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
36 4 adda
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
37 3 changea
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
38 2 changea2
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
39 1 changea3
965b11c1bd82 convert/svn: keep latest and not oldest tag value
Patrick Mezard <pmezard@gmail.com>
parents: 7475
diff changeset
40 0 changea
6400
c237b27e1350 convert: allow tags detection to be disabled
Patrick Mezard <pmezard@gmail.com>
parents: 6399
diff changeset
41 tip