view tests/test-bookmarks-rebase.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]>

% initialize repository
adding a
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding c
created new head
adding d
% bookmark list
 * two                       3:2ae46b1d99a7
   one                       1:925d80f479bb
% rebase
saved backup bundle to 
changeset:   3:9163974d1cb5
tag:         one
tag:         tip
tag:         two
parent:      1:925d80f479bb
parent:      2:db815d6d32e6
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     3

changeset:   2:db815d6d32e6
parent:      0:f7b1eb17ad24
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     2

changeset:   1:925d80f479bb
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     1

changeset:   0:f7b1eb17ad24
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     0