Mercurial > hg
view tests/test-debugbuilddag @ 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 | 0f3c8a47960e |
children | fc360de66217 |
line wrap: on
line source
#! /bin/sh echo "[extensions]" >> $HGRCPATH echo "graphlog=" >> $HGRCPATH echo ---- overwritten and appended files rm -rf repo hg init repo cd repo hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -oa echo -- dag hg debugdag -t -b echo -- glog hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' echo -- glog of hg glog --template '{rev}: {desc} [{branches}]\n' of echo -- glog af hg glog --template '{rev}: {desc} [{branches}]\n' af echo -- tags hg tags -v echo -- cat of hg cat of echo -- cat af hg cat af cd .. echo ---- new and mergeable files rm -rf repo hg init repo cd repo hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -mn echo -- dag hg debugdag -t -b echo -- glog hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' echo -- glog mf hg glog --template '{rev}: {desc} [{branches}]\n' mf echo -- man r4 hg manifest -r4 echo -- cat r4 mf hg cat -r4 mf echo -- man r8 hg manifest -r8 echo -- cat r8 mf hg cat -r8 mf echo -- man hg manifest echo -- cat mf hg cat mf cd .. echo ---- command rm -rf repo hg init repo cd repo hg debugbuilddag '+2 !"touch X" +2' -q -o echo -- dag hg debugdag -t -b echo -- glog hg glog --template '{rev}: {desc} [{branches}]\n' echo -- glog X hg glog --template '{rev}: {desc} [{branches}]\n' X cd ..