annotate tests/test-subrepo-relative-path.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]>

% Preparing the subrepository sub
adding sub/sub
% Preparing the main repo which depends on the subrepo sub
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding main/.hgsub
adding main/main
committing subrepository sub
% Cleaning both repositories, just as a clone -U
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
% Serving them both using hgweb
% Clone main from hgweb
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
updating to branch default
pulling ...sub
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
% Checking cloned repo ids
fdfeeb3e979e tip
863c1745b441 tip
% subrepo debug for main clone
path sub
 source   ../sub
 revision 863c1745b441bd97a8c4a096e87793073f4fb215