tests/test-mq-qimport.out
author David Soria Parra <dsp@php.net>
Tue, 28 Jul 2009 15:36:28 +0200
changeset 9287 53fdf18fd63b
parent 8832 6e6f5b80e056
child 9288 e668bcd0e25f
child 9325 74e717a21779
permissions -rw-r--r--
mq: Parse commit message after we find start of changeset patch patch.extract extracts just the message below HG changeset patch. So to not parse comments above the patch, we reset the message if we find a changeset patch as we know the commit message comes after the changeset patch data. This is similar to the behavior of patch.extract. The drawback of this approach, after a qref -e the comment above HG changeset patch is gone. Without this patch the message would become part of the commit message in the HG changset patch part.

% qimport non-existing-file
abort: unable to read non-existing-file
% import email
adding email to series file
applying email
now at: email
% hg tip -v
changeset:   0:1a706973a7d8
tag:         qtip
tag:         tip
tag:         email
tag:         qbase
user:        Username in patch <test@example.net>
date:        Thu Jan 01 00:00:00 1970 +0000
files:       x
description:
First line of commit message.

More text in commit message.


patch queue now empty
% import URL
adding url.diff to series file
url.diff
% import patch that already exists
abort: patch "url.diff" already exists
applying url.diff
now at: url.diff
foo
patch queue now empty
% qimport -f
adding url.diff to series file
applying url.diff
now at: url.diff
foo2
patch queue now empty
% build diff with CRLF
adding b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% qimport CRLF diff
adding b.diff to series file
applying b.diff
now at: b.diff
% try to import --push
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding another.diff to series file
applying another.diff
now at: another.diff
patch b.diff finalized without changeset message
patch another.diff finalized without changeset message