mercurial: tests/test-mq-merge.out@0ef71bff56b7 (annotated)

4333 4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files". Patrick Mezard <pmezard@gmail.com> parents: diff changeset	1	adding a
4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files". Patrick Mezard <pmezard@gmail.com> parents: diff changeset	2	adding b
4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files". Patrick Mezard <pmezard@gmail.com> parents: diff changeset	3	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files". Patrick Mezard <pmezard@gmail.com> parents: diff changeset	4	M b
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 4437 diff changeset	5	created new head
4333 4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files". Patrick Mezard <pmezard@gmail.com> parents: diff changeset	6	a
4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files". Patrick Mezard <pmezard@gmail.com> parents: diff changeset	7	b
4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files". Patrick Mezard <pmezard@gmail.com> parents: diff changeset	8	applying rm_a
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 6628 diff changeset	9	now at: rm_a
4333 4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files". Patrick Mezard <pmezard@gmail.com> parents: diff changeset	10	b
9110 561ff8d9e4f0 mq: qpop now tells which patches are popped Mads Kiilerich <mads@kiilerich.com> parents: 8433 diff changeset	11	popping rm_a
561ff8d9e4f0 mq: qpop now tells which patches are popped Mads Kiilerich <mads@kiilerich.com> parents: 8433 diff changeset	12	popping .hg.patches.merge.marker
7627 fb32ae9c76e7 mq: lowercase output Martin Geisler <mg@daimi.au.dk> parents: 6628 diff changeset	13	patch queue now empty
6628 f18f14bae172 test-mq-merge: test mq merge and explicit patch queue Patrick Mezard <pmezard@gmail.com> parents: 6336 diff changeset	14
f18f14bae172 test-mq-merge: test mq merge and explicit patch queue Patrick Mezard <pmezard@gmail.com> parents: 6336 diff changeset	15	% init t2
f18f14bae172 test-mq-merge: test mq merge and explicit patch queue Patrick Mezard <pmezard@gmail.com> parents: 6336 diff changeset	16	adding a
f18f14bae172 test-mq-merge: test mq merge and explicit patch queue Patrick Mezard <pmezard@gmail.com> parents: 6336 diff changeset	17	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f18f14bae172 test-mq-merge: test mq merge and explicit patch queue Patrick Mezard <pmezard@gmail.com> parents: 6336 diff changeset	18	% create the reference queue
10185 7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	19	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
6628 f18f14bae172 test-mq-merge: test mq merge and explicit patch queue Patrick Mezard <pmezard@gmail.com> parents: 6336 diff changeset	20	% merge
f18f14bae172 test-mq-merge: test mq merge and explicit patch queue Patrick Mezard <pmezard@gmail.com> parents: 6336 diff changeset	21	merging with queue at refqueue
f18f14bae172 test-mq-merge: test mq merge and explicit patch queue Patrick Mezard <pmezard@gmail.com> parents: 6336 diff changeset	22	applying patcha
10185 7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	23	patching file a
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	24	Hunk #1 FAILED at 0
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	25	1 out of 1 hunks FAILED -- saving rejects to file a.rej
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	26	patch failed, unable to continue (try -v)
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	27	patch failed, rejects left in working dir
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	28	patch didn't work out, merging patcha
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	29	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	30	0 files updated, 2 files merged, 0 files removed, 0 files unresolved
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	31	(branch merge, don't forget to commit)
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	32	applying patcha2
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	33	now at: patcha2
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	34	% check patcha is still a git patch
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10185 diff changeset	35	# HG changeset patch
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10185 diff changeset	36	# Parent d3873e73d99ef67873dac33fbcc66268d5d2b6f4
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10185 diff changeset	37
10185 7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	38	diff --git a/a b/a
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	39	--- a/a
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	40	+++ b/a
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	41	@@ -1,1 +1,2 @@
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	42	-b
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	43	+a
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	44	+c
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	45	diff --git a/a b/aa
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	46	copy from a
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	47	copy to aa
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	48	--- a/a
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	49	+++ b/aa
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	50	@@ -1,1 +1,1 @@
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	51	-b
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	52	+a
7637fe4f525d mq: preserve --git flag when merging patches Patrick Mezard <pmezard@gmail.com> parents: 9110 diff changeset	53	% check patcha2 is still a regular patch

author	Daniel Dumitriu <daniel.dumitriu@gmail.com>
	Thu, 19 Aug 2010 00:01:13 +0200
changeset 12237	0ef71bff56b7
parent 10775	c52057614c72
permissions	-rw-r--r--