Mercurial > hg
view tests/test-ssh-clone-r.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 <mads@kiilerich.com>
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Sat, 10 Jul 2010 21:23:00 +0200 |
parents | f2618cacb485 |
children |
line wrap: on
line source
# creating 'remote' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head 1 files updated, 0 files merged, 2 files removed, 0 files unresolved rev offset length base linkrev nodeid p1 p2 0 0 3 0 0 362fef284ce2 000000000000 000000000000 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 rev offset length base linkrev nodeid p1 p2 0 0 75 0 7 2565f3199a74 000000000000 000000000000 rev offset length base linkrev nodeid p1 p2 0 0 75 0 8 2565f3199a74 000000000000 000000000000 rev offset length base linkrev nodeid p1 p2 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 rev offset length base linkrev nodeid p1 p2 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 5 250 68 3 7 09bb521d218d de68e904d169 000000000000 6 318 54 6 8 1fde233dfb0f f54c32f13478 000000000000 checking changesets checking manifests crosschecking files in changesets and manifests checking files 4 files, 9 changesets, 7 total revisions # clone remote via stream requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions requesting all changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 2 changesets, 2 total revisions requesting all changes adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 1 files updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 3 changesets, 3 total revisions requesting all changes adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 1 files updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 4 changesets, 4 total revisions requesting all changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 2 changesets, 2 total revisions requesting all changes adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 1 files updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 3 changesets, 3 total revisions requesting all changes adding changesets adding manifests adding file changes added 4 changesets with 5 changes to 2 files updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 2 files, 4 changesets, 5 total revisions requesting all changes adding changesets adding manifests adding file changes added 5 changesets with 6 changes to 3 files updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 3 files, 5 changesets, 6 total revisions requesting all changes adding changesets adding manifests adding file changes added 5 changesets with 5 changes to 2 files updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 2 files, 5 changesets, 5 total revisions pulling from ../test-7 searching for changes adding changesets adding manifests adding file changes added 4 changesets with 2 changes to 3 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) checking changesets checking manifests crosschecking files in changesets and manifests checking files 4 files, 9 changesets, 7 total revisions pulling from ssh://user@dummy/remote searching for changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 3 changesets, 2 total revisions pulling from ssh://user@dummy/remote searching for changes adding changesets adding manifests adding file changes added 6 changesets with 5 changes to 4 files (run 'hg update' to get a working copy) pulling from ssh://user@dummy/remote searching for changes adding changesets adding manifests adding file changes added 2 changesets with 0 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 5 changesets, 3 total revisions pulling from ssh://user@dummy/remote searching for changes adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 4 files (run 'hg update' to get a working copy) checking changesets checking manifests crosschecking files in changesets and manifests checking files 4 files, 9 changesets, 7 total revisions