Mercurial > hg
changeset 14181:bf951d58b917
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 03 May 2011 22:04:23 -0500 |
| parents | 1123bbba278d (current diff) 31ec4d7eb63f (diff) |
| children | 333def42e785 |
| files | hgext/mq.py |
| diffstat | 2 files changed, 9 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Tue May 03 22:04:11 2011 -0500 +++ b/hgext/mq.py Tue May 03 22:04:23 2011 -0500 @@ -107,7 +107,7 @@ elif line.startswith("# Date "): date = line[7:] elif line.startswith("# Parent "): - parent = line[9:] + parent = line[9:].lstrip() elif line.startswith("# Branch "): branch = line[9:] elif line.startswith("# Node ID "):
--- a/tests/test-mq-qpush-exact.t Tue May 03 22:04:11 2011 -0500 +++ b/tests/test-mq-qpush-exact.t Tue May 03 22:04:23 2011 -0500 @@ -26,7 +26,14 @@ $ echo cp0 >> fp0 $ hg add fp0 - $ hg qnew p0 -d "0 0" + $ hg ci -m p0 -d "0 0" + $ hg export -r. > p0 + $ hg strip -qn . + $ hg qimport p0 + adding p0 to series file + $ hg qpush + applying p0 + now at: p0 $ echo cp1 >> fp1 $ hg add fp1 @@ -63,15 +70,6 @@ $ hg qpop -aq patch queue now empty - $ hg qpush -ea - applying p0 - applying p1 - now at: p1 - $ hg parents -qr qbase - 1:d7fe2034f71b - $ hg qpop -aq - patch queue now empty - qpush --exact when at another rev $ hg update 0 -q