upstream/mercurial-mirror Files · tests/test-mq-header-from.out

merge with stable

Steve Losh - - Load All Authors

File last commit:

r10397:8cb81d75 default


                r12315:ca58f647

default

Download file

             test-mq-header-from.out
        
                    829 lines
            
             | 12.2 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-mq-header-from.out

History | Source | Raw |Copy content |Copy permalink

Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	======= plain headers
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	==== init
		==== qnew -U
		From: test

		0: [mq]: 1.patch - test
		==== qref
		adding 1
		From: test

		diff -r ... 1
		--- /dev/null
		+++ b/1
		@@ -0,0 +1,1 @@
		+1
		0: [mq]: 1.patch - test
		==== qref -u
		From: mary

		diff -r ... 1
		--- /dev/null
		+++ b/1
		@@ -0,0 +1,1 @@
		+1
		0: [mq]: 1.patch - mary
		==== qnew
		adding 2
		diff -r ... 2
		--- /dev/null
		+++ b/2
		@@ -0,0 +1,1 @@
		+2
		1: [mq]: 2.patch - test
		0: [mq]: 1.patch - mary
		==== qref -u
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	From: jane
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673
		diff -r ... 2
		--- /dev/null
		+++ b/2
		@@ -0,0 +1,1 @@
		+2
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qnew -U -m
		From: test

		Three
Bernhard Leiner mq: make qnew patch format consistent with qrefresh (issue1457)	r7614
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	2: Three - test
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qref
		adding 3
		From: test

		Three

		diff -r ... 3
		--- /dev/null
		+++ b/3
		@@ -0,0 +1,1 @@
		+3
		2: Three - test
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qref -m
		From: test

		Drei

		diff -r ... 3
		--- /dev/null
		+++ b/3
		@@ -0,0 +1,1 @@
		+3
		2: Drei - test
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qref -u
		From: mary

		Drei

		diff -r ... 3
		--- /dev/null
		+++ b/3
		@@ -0,0 +1,1 @@
		+3
		2: Drei - mary
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qref -u -m
		From: maria

		Three (again)

		diff -r ... 3
		--- /dev/null
		+++ b/3
		@@ -0,0 +1,1 @@
		+3
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qnew -m
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	adding 4of
		Four

		diff -r ... 4of
		--- /dev/null
		+++ b/4of
		@@ -0,0 +1,1 @@
		+4 t
		3: Four - test
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qref -u
		From: jane
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	Four

Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	diff -r ... 4of
		--- /dev/null
		+++ b/4of
		@@ -0,0 +1,1 @@
		+4 t
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qnew with HG header
		popping 5.patch
		now at: 4.patch
		now at: 5.patch
		# HG changeset patch
		# User johndoe
		4: imported patch 5.patch - johndoe
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref
		adding 5
		# HG changeset patch
		# Parent
		# User johndoe

		diff -r ... 5
		--- /dev/null
		+++ b/5
		@@ -0,0 +1,1 @@
		+5
		4: [mq]: 5.patch - johndoe
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref -U
		# HG changeset patch
		# Parent
		# User test

		diff -r ... 5
		--- /dev/null
		+++ b/5
		@@ -0,0 +1,1 @@
		+5
		4: [mq]: 5.patch - test
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref -u
		# HG changeset patch
		# Parent
		# User johndeere

		diff -r ... 5
		--- /dev/null
		+++ b/5
		@@ -0,0 +1,1 @@
		+5
		4: [mq]: 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qnew with plain header
		popping 6.patch
		now at: 5.patch
		now at: 6.patch
		From: test

		5: imported patch 6.patch - test
		4: [mq]: 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref
		adding 6
		From: test

		diff -r ... 6
		--- /dev/null
		+++ b/6
		@@ -0,0 +1,1 @@
		+6
		5: [mq]: 6.patch - test
		4: [mq]: 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref -U
		From: test

		diff -r ... 6
		--- /dev/null
		+++ b/6
		@@ -0,0 +1,1 @@
		+6
		5: [mq]: 6.patch - test
		4: [mq]: 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref -u
		From: johndeere

		diff -r ... 6
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	--- /dev/null
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	+++ b/6
		@@ -0,0 +1,1 @@
		+6
		5: [mq]: 6.patch - johndeere
		4: [mq]: 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qpop -a / qpush -a
		popping 6.patch
		popping 5.patch
		popping 4.patch
		popping 3.patch
		popping 2.patch
		popping 1.patch
		patch queue now empty
		applying 1.patch
		applying 2.patch
		applying 3.patch
		applying 4.patch
		applying 5.patch
		applying 6.patch
		now at: 6.patch
		5: imported patch 6.patch - johndeere
		4: imported patch 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: imported patch 2.patch - jane
		0: imported patch 1.patch - mary
		======= hg headers
		==== init
		==== qnew -U
		# HG changeset patch
		# Parent
		# User test
		0: [mq]: 1.patch - test
		==== qref
		adding 1
		# HG changeset patch
		# Parent
		# User test

		diff -r ... 1
		--- /dev/null
		+++ b/1
		@@ -0,0 +1,1 @@
		+1
		0: [mq]: 1.patch - test
		==== qref -u
		# HG changeset patch
		# Parent
		# User mary

		diff -r ... 1
		--- /dev/null
		+++ b/1
		@@ -0,0 +1,1 @@
		+1
		0: [mq]: 1.patch - mary
		==== qnew
		adding 2
		# HG changeset patch
		# Parent

		diff -r ... 2
		--- /dev/null
		+++ b/2
		@@ -0,0 +1,1 @@
		+2
		1: [mq]: 2.patch - test
		0: [mq]: 1.patch - mary
		==== qref -u
		# HG changeset patch
		# User jane
		# Parent

		diff -r ... 2
		--- /dev/null
		+++ b/2
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	@@ -0,0 +1,1 @@
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	+2
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qnew -U -m
		# HG changeset patch
		# Parent
		# User test
		Three

		2: Three - test
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qref
		adding 3
		# HG changeset patch
		# Parent
		# User test
		Three

		diff -r ... 3
		--- /dev/null
		+++ b/3
		@@ -0,0 +1,1 @@
		+3
		2: Three - test
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qref -m
		# HG changeset patch
		# Parent
		# User test
		Drei

		diff -r ... 3
		--- /dev/null
		+++ b/3
		@@ -0,0 +1,1 @@
		+3
		2: Drei - test
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qref -u
		# HG changeset patch
		# Parent
		# User mary
		Drei

		diff -r ... 3
		--- /dev/null
		+++ b/3
		@@ -0,0 +1,1 @@
		+3
		2: Drei - mary
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qref -u -m
		# HG changeset patch
		# Parent
		# User maria
		Three (again)

		diff -r ... 3
		--- /dev/null
		+++ b/3
		@@ -0,0 +1,1 @@
		+3
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qnew -m
		adding 4of
		# HG changeset patch
		# Parent
		Four

		diff -r ... 4of
		--- /dev/null
		+++ b/4of
		@@ -0,0 +1,1 @@
		+4 t
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	3: Four - test
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qref -u
Yann E. MORIN mq: upgrade the patch to HG format when adding the author name with qrefresh...	r9336	# HG changeset patch
		# User jane
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	# Parent
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	Four

Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	diff -r ... 4of
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	--- /dev/null
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	+++ b/4of
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	@@ -0,0 +1,1 @@
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	+4 t
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qnew with HG header
Mads Kiilerich mq: qpop now tells which patches are popped...	r9110	popping 5.patch
Martin Geisler mq: lowercase output...	r7627	now at: 4.patch
		now at: 5.patch
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	# HG changeset patch
		# User johndoe
		4: imported patch 5.patch - johndoe
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref
		adding 5
		# HG changeset patch
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	# Parent
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	# User johndoe

		diff -r ... 5
		--- /dev/null
		+++ b/5
		@@ -0,0 +1,1 @@
		+5
		4: [mq]: 5.patch - johndoe
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref -U
		# HG changeset patch
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	# Parent
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	# User test

		diff -r ... 5
		--- /dev/null
		+++ b/5
		@@ -0,0 +1,1 @@
		+5
		4: [mq]: 5.patch - test
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref -u
		# HG changeset patch
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	# Parent
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	# User johndeere

		diff -r ... 5
		--- /dev/null
		+++ b/5
		@@ -0,0 +1,1 @@
		+5
		4: [mq]: 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	==== qnew with plain header
		popping 6.patch
		now at: 5.patch
		now at: 6.patch
		From: test

		5: imported patch 6.patch - test
		4: [mq]: 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref
		adding 6
		From: test

		diff -r ... 6
		--- /dev/null
		+++ b/6
		@@ -0,0 +1,1 @@
		+6
		5: [mq]: 6.patch - test
		4: [mq]: 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref -U
		From: test

		diff -r ... 6
		--- /dev/null
		+++ b/6
		@@ -0,0 +1,1 @@
		+6
		5: [mq]: 6.patch - test
		4: [mq]: 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref -u
		From: johndeere

		diff -r ... 6
		--- /dev/null
		+++ b/6
		@@ -0,0 +1,1 @@
		+6
		5: [mq]: 6.patch - johndeere
		4: [mq]: 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	==== qpop -a / qpush -a
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	popping 6.patch
Mads Kiilerich mq: qpop now tells which patches are popped...	r9110	popping 5.patch
		popping 4.patch
		popping 3.patch
		popping 2.patch
		popping 1.patch
Martin Geisler mq: lowercase output...	r7627	patch queue now empty
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	applying 1.patch
		applying 2.patch
		applying 3.patch
		applying 4.patch
		applying 5.patch
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	applying 6.patch
		now at: 6.patch
		5: imported patch 6.patch - johndeere
peter.arrenbrecht@gmail.com mq: add --currentuser and --user options to qnew and qrefresh...	r5673	4: imported patch 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: imported patch 2.patch - jane
		0: imported patch 1.patch - mary
Steve Losh mq: add parent node IDs to MQ patches on qrefresh/qnew...	r10397	==== init
		==== qnew -U
		# HG changeset patch
		# Parent
		# User test
		0: [mq]: 1.patch - test
		==== qref
		adding 1
		# HG changeset patch
		# Parent
		# User test

		diff -r ... 1
		--- /dev/null
		+++ b/1
		@@ -0,0 +1,1 @@
		+1
		0: [mq]: 1.patch - test
		==== qref -u
		# HG changeset patch
		# Parent
		# User mary

		diff -r ... 1
		--- /dev/null
		+++ b/1
		@@ -0,0 +1,1 @@
		+1
		0: [mq]: 1.patch - mary
		==== qnew
		adding 2
		# HG changeset patch
		# Parent

		diff -r ... 2
		--- /dev/null
		+++ b/2
		@@ -0,0 +1,1 @@
		+2
		1: [mq]: 2.patch - test
		0: [mq]: 1.patch - mary
		==== qref -u
		# HG changeset patch
		# User jane
		# Parent

		diff -r ... 2
		--- /dev/null
		+++ b/2
		@@ -0,0 +1,1 @@
		+2
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qnew -U -m
		# HG changeset patch
		# Parent
		# User test
		Three

		2: Three - test
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qref
		adding 3
		# HG changeset patch
		# Parent
		# User test
		Three

		diff -r ... 3
		--- /dev/null
		+++ b/3
		@@ -0,0 +1,1 @@
		+3
		2: Three - test
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qref -m
		# HG changeset patch
		# Parent
		# User test
		Drei

		diff -r ... 3
		--- /dev/null
		+++ b/3
		@@ -0,0 +1,1 @@
		+3
		2: Drei - test
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qref -u
		# HG changeset patch
		# Parent
		# User mary
		Drei

		diff -r ... 3
		--- /dev/null
		+++ b/3
		@@ -0,0 +1,1 @@
		+3
		2: Drei - mary
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qref -u -m
		# HG changeset patch
		# Parent
		# User maria
		Three (again)

		diff -r ... 3
		--- /dev/null
		+++ b/3
		@@ -0,0 +1,1 @@
		+3
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qnew -m
		adding 4of
		# HG changeset patch
		# Parent
		Four

		diff -r ... 4of
		--- /dev/null
		+++ b/4of
		@@ -0,0 +1,1 @@
		+4 t
		3: Four - test
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qref -u
		# HG changeset patch
		# User jane
		# Parent
		Four

		diff -r ... 4of
		--- /dev/null
		+++ b/4of
		@@ -0,0 +1,1 @@
		+4 t
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qnew with HG header
		popping 5.patch
		now at: 4.patch
		now at: 5.patch
		# HG changeset patch
		# User johndoe
		4: imported patch 5.patch - johndoe
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref
		adding 5
		# HG changeset patch
		# Parent
		# User johndoe

		diff -r ... 5
		--- /dev/null
		+++ b/5
		@@ -0,0 +1,1 @@
		+5
		4: [mq]: 5.patch - johndoe
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref -U
		# HG changeset patch
		# Parent
		# User test

		diff -r ... 5
		--- /dev/null
		+++ b/5
		@@ -0,0 +1,1 @@
		+5
		4: [mq]: 5.patch - test
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref -u
		# HG changeset patch
		# Parent
		# User johndeere

		diff -r ... 5
		--- /dev/null
		+++ b/5
		@@ -0,0 +1,1 @@
		+5
		4: [mq]: 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qnew with plain header
		popping 6.patch
		now at: 5.patch
		now at: 6.patch
		From: test

		5: imported patch 6.patch - test
		4: [mq]: 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref
		adding 6
		From: test

		diff -r ... 6
		--- /dev/null
		+++ b/6
		@@ -0,0 +1,1 @@
		+6
		5: [mq]: 6.patch - test
		4: [mq]: 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref -U
		From: test

		diff -r ... 6
		--- /dev/null
		+++ b/6
		@@ -0,0 +1,1 @@
		+6
		5: [mq]: 6.patch - test
		4: [mq]: 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== hg qref -u
		From: johndeere

		diff -r ... 6
		--- /dev/null
		+++ b/6
		@@ -0,0 +1,1 @@
		+6
		5: [mq]: 6.patch - johndeere
		4: [mq]: 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: [mq]: 2.patch - jane
		0: [mq]: 1.patch - mary
		==== qpop -a / qpush -a
		popping 6.patch
		popping 5.patch
		popping 4.patch
		popping 3.patch
		popping 2.patch
		popping 1.patch
		patch queue now empty
		applying 1.patch
		applying 2.patch
		applying 3.patch
		applying 4.patch
		applying 5.patch
		applying 6.patch
		now at: 6.patch
		5: imported patch 6.patch - johndeere
		4: imported patch 5.patch - johndeere
		3: Four - jane
		2: Three (again) - maria
		1: imported patch 2.patch - jane
		0: imported patch 1.patch - mary

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages