Mercurial > hg
view tests/test-mq-pull-from-bundle.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 | a3d73b3e1f8a |
children |
line wrap: on
line source
====== Setup main adding one ====== Bundle main 2 changesets found ====== Incoming to fresh repo >> hg -R fresh incoming main.hg comparing with main.hg 0: main: one added. 1: main: one updated. >> hg -R fresh incoming bundle:fresh+main.hg comparing with bundle:fresh+main.hg 0: main: one added. 1: main: one updated. ====== Setup queue adding two popping two.patch patch queue now empty ====== Bundle queue 1 changesets found ====== Clone base updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ====== Incoming queue bundle >> hg -R .hg/patches incoming ../queue.hgq comparing with ../queue.hgq 0: queue: two.patch added. ====== Pull queue bundle >> hg -R .hg/patches pull --update ../queue.hgq pulling from ../queue.hgq requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 3 changes to 3 files merging series 2 files updated, 1 files merged, 0 files removed, 0 files unresolved >> hg -R .hg/patches heads 0: queue: two.patch added. >> hg -R .hg/patches log 0: queue: two.patch added. >> hg qseries two.patch ====== Clone base again updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ====== Unbundle queue bundle >> hg -R .hg/patches unbundle --update ../queue.hgq adding changesets adding manifests adding file changes added 1 changesets with 3 changes to 3 files merging series 2 files updated, 1 files merged, 0 files removed, 0 files unresolved >> hg -R .hg/patches heads 0: queue: two.patch added. >> hg -R .hg/patches log 0: queue: two.patch added. >> hg qseries two.patch