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

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 <[e-mail]>

adding a
marked working directory as branch brancha
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
marked working directory as branch branchb
adding b
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
% convert with datesort
initializing destination t-datesort repository
scanning source...
sorting...
converting...
8 a0
7 a1
6 a2
5 a3
4 a4
3 b0
2 a5
1 a6
0 b1
% graph converted repo
o  8 "b1"
|
| o  7 "a6"
| |
| o  6 "a5"
| |
o |  5 "b0"
| |
| o  4 "a4"
| |
| o  3 "a3"
| |
| o  2 "a2"
| |
| o  1 "a1"
|/
o  0 "a0"

% convert with datesort (default mode)
initializing destination t-sourcesort repository
scanning source...
sorting...
converting...
8 a0
7 a1
6 a2
5 a3
4 b0
3 a4
2 a5
1 a6
0 b1
% graph converted repo
o  8 "b1"
|
| o  7 "a6"
| |
| o  6 "a5"
| |
| o  5 "a4"
| |
o |  4 "b0"
| |
| o  3 "a3"
| |
| o  2 "a2"
| |
| o  1 "a1"
|/
o  0 "a0"