annotate tests/test-mq-header-date.t @ 44909:d452acc8cce8 stable

flags: account for flag change when tracking rename relevant to merge There are some logic filtering rename to the one relevant to the merge. That logic was oblivious of flag change, leading to exec flag being dropped when merged with a renamed. There are two others bugs affecting this scenario. This patch fix the was where there is not modification involved except for the flag change. Fixes for the other bug are coming in later changesets. Differential Revision: https://phab.mercurial-scm.org/D8531
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 16 May 2020 20:37:56 +0200
parents 88e7105b5cd9
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5788
4107e823dc2c mq: add --currentdate and --date options to qnew and qrefresh
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
1
23172
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22546
diff changeset
2 $ cat <<EOF >> $HGRCPATH
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22546
diff changeset
3 > [extensions]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22546
diff changeset
4 > mq =
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22546
diff changeset
5 > [diff]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22546
diff changeset
6 > nodates = true
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents: 22546
diff changeset
7 > EOF
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
8 $ catpatch() {
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
9 > cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
10 > -e "s/^\(# Parent \).*/\1/"
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
11 > }
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
12 $ catlog() {
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
13 > catpatch $1
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
14 > hg log --template "{rev}: {node|short} {desc} - {author}\n"
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
15 > }
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
16 $ catlogd() {
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
17 > catpatch $1
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
18 > hg log --template "{rev}: {node|short} {desc} - {author} - {date}\n"
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
19 > }
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
20 $ drop() {
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
21 > hg qpop
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
22 > hg qdel $1.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
23 > }
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
24 $ runtest() {
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
25 > echo ==== init
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
26 > hg init a
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
27 > cd a
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
28 > hg qinit
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
29 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
30 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
31 > echo ==== qnew -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
32 > hg qnew -d '3 0' 1.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
33 > catlogd 1
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
34 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
35 > echo ==== qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
36 > echo "1" >1
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
37 > hg add
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
38 > hg qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
39 > catlogd 1
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
40 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
41 > echo ==== qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
42 > hg qref -d '4 0'
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
43 > catlogd 1
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
44 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
45 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
46 > echo ==== qnew
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
47 > hg qnew 2.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
48 > echo "2" >2
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
49 > hg add
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
50 > hg qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
51 > catlog 2
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
52 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
53 > echo ==== qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
54 > hg qref -d '5 0'
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
55 > catlog 2
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
56 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
57 > drop 2
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
58 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
59 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
60 > echo ==== qnew -d -m
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
61 > hg qnew -d '6 0' -m "Three" 3.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
62 > catlogd 3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
63 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
64 > echo ==== qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
65 > echo "3" >3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
66 > hg add
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
67 > hg qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
68 > catlogd 3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
69 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
70 > echo ==== qref -m
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
71 > hg qref -m "Drei"
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
72 > catlogd 3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
73 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
74 > echo ==== qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
75 > hg qref -d '7 0'
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
76 > catlogd 3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
77 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
78 > echo ==== qref -d -m
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
79 > hg qref -d '8 0' -m "Three (again)"
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
80 > catlogd 3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
81 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
82 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
83 > echo ==== qnew -m
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
84 > hg qnew -m "Four" 4.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
85 > echo "4" >4
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
86 > hg add
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
87 > hg qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
88 > catlog 4
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
89 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
90 > echo ==== qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
91 > hg qref -d '9 0'
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
92 > catlog 4
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
93 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
94 > drop 4
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
95 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
96 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
97 > echo ==== qnew with HG header
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
98 > hg qnew --config 'mq.plain=true' 5.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
99 > hg qpop
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
100 > echo "# HG changeset patch" >>.hg/patches/5.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
101 > echo "# Date 10 0" >>.hg/patches/5.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
102 > hg qpush 2>&1 | grep 'Now at'
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
103 > catlogd 5
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
104 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
105 > echo ==== hg qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
106 > echo "5" >5
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
107 > hg add
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
108 > hg qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
109 > catlogd 5
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
110 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
111 > echo ==== hg qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
112 > hg qref -d '11 0'
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
113 > catlogd 5
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
114 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
115 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
116 > echo ==== qnew with plain header
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
117 > hg qnew --config 'mq.plain=true' -d '12 0' 6.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
118 > hg qpop
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
119 > hg qpush 2>&1 | grep 'now at'
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
120 > catlog 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
121 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
122 > echo ==== hg qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
123 > echo "6" >6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
124 > hg add
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
125 > hg qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
126 > catlogd 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
127 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
128 > echo ==== hg qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
129 > hg qref -d '13 0'
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
130 > catlogd 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
131 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
132 > drop 6
17347
2da47de36b6f check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents: 12461
diff changeset
133 >
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
134 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
135 > echo ==== qnew -u
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
136 > hg qnew -u jane 6.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
137 > echo "6" >6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
138 > hg add
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
139 > hg qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
140 > catlog 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
141 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
142 > echo ==== qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
143 > hg qref -d '12 0'
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
144 > catlog 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
145 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
146 > drop 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
147 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
148 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
149 > echo ==== qnew -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
150 > hg qnew -d '13 0' 7.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
151 > echo "7" >7
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
152 > hg add
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
153 > hg qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
154 > catlog 7
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
155 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
156 > echo ==== qref -u
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
157 > hg qref -u john
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
158 > catlogd 7
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
159 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
160 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
161 > echo ==== qnew
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
162 > hg qnew 8.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
163 > echo "8" >8
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
164 > hg add
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
165 > hg qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
166 > catlog 8
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
167 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
168 > echo ==== qref -u -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
169 > hg qref -u john -d '14 0'
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
170 > catlog 8
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
171 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
172 > drop 8
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
173 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
174 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
175 > echo ==== qnew -m
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
176 > hg qnew -m "Nine" 9.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
177 > echo "9" >9
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
178 > hg add
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
179 > hg qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
180 > catlog 9
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
181 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
182 > echo ==== qref -u -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
183 > hg qref -u john -d '15 0'
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
184 > catlog 9
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
185 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
186 > drop 9
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
187 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
188 >
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
189 > echo ==== "qpop -a / qpush -a"
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
190 > hg qpop -a
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
191 > hg qpush -a
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
192 > hg log --template "{rev}: {node|short} {desc} - {author} - {date}\n"
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
193 > }
5788
4107e823dc2c mq: add --currentdate and --date options to qnew and qrefresh
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
194
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
195 ======= plain headers
5788
4107e823dc2c mq: add --currentdate and --date options to qnew and qrefresh
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
196
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
197 $ echo "[mq]" >> $HGRCPATH
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
198 $ echo "plain=true" >> $HGRCPATH
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
199 $ mkdir sandbox
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
200 $ (cd sandbox ; runtest)
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
201 ==== init
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
202 ==== qnew -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
203 Date: 3 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
204
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
205 0: 758bd2596a39 [mq]: 1.patch - test - 3.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
206 ==== qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
207 adding 1
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
208 Date: 3 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
209
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
210 diff -r ... 1
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
211 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
212 +++ b/1
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
213 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
214 +1
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
215 0: 8c640e9949a8 [mq]: 1.patch - test - 3.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
216 ==== qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
217 Date: 4 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
218
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
219 diff -r ... 1
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
220 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
221 +++ b/1
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
222 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
223 +1
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
224 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
225 ==== qnew
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
226 adding 2
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
227 diff -r ... 2
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
228 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
229 +++ b/2
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
230 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
231 +2
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
232 1: fc7e8a2f6499 [mq]: 2.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
233 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
234 ==== qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
235 Date: 5 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
236
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
237 diff -r ... 2
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
238 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
239 +++ b/2
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
240 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
241 +2
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
242 1: 1d9a6a118fd1 [mq]: 2.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
243 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
244 popping 2.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
245 now at: 1.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
246 ==== qnew -d -m
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
247 Date: 6 0
23344
6333412245ec mq: when setting message in plain mode, separate it from header (issue4453)
Mads Kiilerich <madski@unity3d.com>
parents: 22546
diff changeset
248
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
249 Three
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
250
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
251 1: 2a9ef0bdefba Three - test - 6.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
252 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
253 ==== qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
254 adding 3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
255 Date: 6 0
23344
6333412245ec mq: when setting message in plain mode, separate it from header (issue4453)
Mads Kiilerich <madski@unity3d.com>
parents: 22546
diff changeset
256
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
257 Three
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
258
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
259 diff -r ... 3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
260 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
261 +++ b/3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
262 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
263 +3
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
264 1: 7f19ad9eea7b Three - test - 6.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
265 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
266 ==== qref -m
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
267 Date: 6 0
23344
6333412245ec mq: when setting message in plain mode, separate it from header (issue4453)
Mads Kiilerich <madski@unity3d.com>
parents: 22546
diff changeset
268
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
269 Drei
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
270
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
271 diff -r ... 3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
272 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
273 +++ b/3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
274 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
275 +3
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
276 1: 7ff7377793e3 Drei - test - 6.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
277 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
278 ==== qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
279 Date: 7 0
23344
6333412245ec mq: when setting message in plain mode, separate it from header (issue4453)
Mads Kiilerich <madski@unity3d.com>
parents: 22546
diff changeset
280
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
281 Drei
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
282
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
283 diff -r ... 3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
284 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
285 +++ b/3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
286 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
287 +3
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
288 1: d89d3144f518 Drei - test - 7.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
289 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
290 ==== qref -d -m
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
291 Date: 8 0
23344
6333412245ec mq: when setting message in plain mode, separate it from header (issue4453)
Mads Kiilerich <madski@unity3d.com>
parents: 22546
diff changeset
292
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
293 Three (again)
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
294
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
295 diff -r ... 3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
296 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
297 +++ b/3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
298 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
299 +3
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
300 1: b1b6b0fe0e6d Three (again) - test - 8.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
301 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
302 ==== qnew -m
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
303 adding 4
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
304 Four
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
305
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
306 diff -r ... 4
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
307 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
308 +++ b/4
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
309 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
310 +4
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
311 2: 74ded07d166b Four - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
312 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
313 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
314 ==== qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
315 Date: 9 0
23346
5ccced6eab0b mq: when adding headers in plain mode, separate them from message (issue4453)
Mads Kiilerich <madski@unity3d.com>
parents: 23344
diff changeset
316
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
317 Four
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
318
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
319 diff -r ... 4
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
320 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
321 +++ b/4
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
322 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
323 +4
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
324 2: 1a651320cf8e Four - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
325 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
326 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
327 popping 4.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
328 now at: 3.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
329 ==== qnew with HG header
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
330 popping 5.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
331 now at: 3.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
332 # HG changeset patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
333 # Date 10 0
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
334 2: d16a272220d2 imported patch 5.patch - test - 10.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
335 1: b1b6b0fe0e6d Three (again) - test - 8.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
336 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
337 ==== hg qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
338 adding 5
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
339 # HG changeset patch
22546
aac5482db318 mq: refactor patchheader header ordering to match export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22520
diff changeset
340 # Date 10 0
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
341 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
342
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
343 diff -r ... 5
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
344 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
345 +++ b/5
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
346 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
347 +5
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
348 2: 5dbf69c07df9 [mq]: 5.patch - test - 10.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
349 1: b1b6b0fe0e6d Three (again) - test - 8.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
350 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
351 ==== hg qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
352 # HG changeset patch
22546
aac5482db318 mq: refactor patchheader header ordering to match export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22520
diff changeset
353 # Date 11 0
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
354 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
355
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
356 diff -r ... 5
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
357 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
358 +++ b/5
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
359 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
360 +5
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
361 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
362 1: b1b6b0fe0e6d Three (again) - test - 8.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
363 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
364 ==== qnew with plain header
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
365 popping 6.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
366 now at: 5.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
367 now at: 6.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
368 Date: 12 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
369
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
370 3: 8ad9ebc22b96 imported patch 6.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
371 2: 049de6af0c1d [mq]: 5.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
372 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
373 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
374 ==== hg qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
375 adding 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
376 Date: 12 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
377
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
378 diff -r ... 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
379 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
380 +++ b/6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
381 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
382 +6
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
383 3: 038c46b02a56 [mq]: 6.patch - test - 12.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
384 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
385 1: b1b6b0fe0e6d Three (again) - test - 8.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
386 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
387 ==== hg qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
388 Date: 13 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
389
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
390 diff -r ... 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
391 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
392 +++ b/6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
393 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
394 +6
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
395 3: 2785642ea4b4 [mq]: 6.patch - test - 13.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
396 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
397 1: b1b6b0fe0e6d Three (again) - test - 8.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
398 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
399 popping 6.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
400 now at: 5.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
401 ==== qnew -u
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
402 adding 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
403 From: jane
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
404
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
405 diff -r ... 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
406 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
407 +++ b/6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
408 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
409 +6
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
410 3: a05a33f187ce [mq]: 6.patch - jane
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
411 2: 049de6af0c1d [mq]: 5.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
412 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
413 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
414 ==== qref -d
23442
a5c94ea3b8af mq: smarter handling of plain headers
Mads Kiilerich <madski@unity3d.com>
parents: 23350
diff changeset
415 From: jane
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
416 Date: 12 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
417
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
418 diff -r ... 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
419 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
420 +++ b/6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
421 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
422 +6
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
423 3: 5702c529dfe9 [mq]: 6.patch - jane
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
424 2: 049de6af0c1d [mq]: 5.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
425 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
426 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
427 popping 6.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
428 now at: 5.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
429 ==== qnew -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
430 adding 7
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
431 Date: 13 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
432
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
433 diff -r ... 7
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
434 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
435 +++ b/7
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
436 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
437 +7
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
438 3: 8dd1eb8d4132 [mq]: 7.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
439 2: 049de6af0c1d [mq]: 5.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
440 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
441 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
442 ==== qref -u
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
443 From: john
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
444 Date: 13 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
445
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
446 diff -r ... 7
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
447 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
448 +++ b/7
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
449 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
450 +7
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
451 3: 4f9d07369cc4 [mq]: 7.patch - john - 13.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
452 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
453 1: b1b6b0fe0e6d Three (again) - test - 8.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
454 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
455 ==== qnew
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
456 adding 8
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
457 diff -r ... 8
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
458 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
459 +++ b/8
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
460 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
461 +8
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
462 4: 868b62f09492 [mq]: 8.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
463 3: 4f9d07369cc4 [mq]: 7.patch - john
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
464 2: 049de6af0c1d [mq]: 5.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
465 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
466 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
467 ==== qref -u -d
23442
a5c94ea3b8af mq: smarter handling of plain headers
Mads Kiilerich <madski@unity3d.com>
parents: 23350
diff changeset
468 From: john
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
469 Date: 14 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
470
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
471 diff -r ... 8
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
472 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
473 +++ b/8
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
474 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
475 +8
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
476 4: b1e878ae55b9 [mq]: 8.patch - john
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
477 3: 4f9d07369cc4 [mq]: 7.patch - john
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
478 2: 049de6af0c1d [mq]: 5.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
479 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
480 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
481 popping 8.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
482 now at: 7.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
483 ==== qnew -m
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
484 adding 9
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
485 Nine
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
486
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
487 diff -r ... 9
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
488 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
489 +++ b/9
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
490 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
491 +9
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
492 4: 7251936ac2bf Nine - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
493 3: 4f9d07369cc4 [mq]: 7.patch - john
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
494 2: 049de6af0c1d [mq]: 5.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
495 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
496 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
497 ==== qref -u -d
23442
a5c94ea3b8af mq: smarter handling of plain headers
Mads Kiilerich <madski@unity3d.com>
parents: 23350
diff changeset
498 From: john
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
499 Date: 15 0
23346
5ccced6eab0b mq: when adding headers in plain mode, separate them from message (issue4453)
Mads Kiilerich <madski@unity3d.com>
parents: 23344
diff changeset
500
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
501 Nine
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
502
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
503 diff -r ... 9
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
504 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
505 +++ b/9
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
506 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
507 +9
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
508 4: a0de5bf6e9f7 Nine - john
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
509 3: 4f9d07369cc4 [mq]: 7.patch - john
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
510 2: 049de6af0c1d [mq]: 5.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
511 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
512 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
513 popping 9.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
514 now at: 7.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
515 ==== qpop -a / qpush -a
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
516 popping 7.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
517 popping 5.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
518 popping 3.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
519 popping 1.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
520 patch queue now empty
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
521 applying 1.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
522 applying 3.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
523 applying 5.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
524 applying 7.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
525 now at: 7.patch
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
526 3: d26a5b7ffce1 imported patch 7.patch - john - 13.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
527 2: dda6cf77060a imported patch 5.patch - test - 11.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
528 1: 25e32d66c8c7 Three (again) - test - 8.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
529 0: e5011c0211fe imported patch 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
530 $ rm -r sandbox
10397
8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew
Steve Losh <steve@stevelosh.com>
parents: 5822
diff changeset
531
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
532 ======= hg headers
5788
4107e823dc2c mq: add --currentdate and --date options to qnew and qrefresh
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
533
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
534 $ echo "plain=false" >> $HGRCPATH
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
535 $ mkdir sandbox
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
536 $ (cd sandbox ; runtest)
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
537 ==== init
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
538 ==== qnew -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
539 # HG changeset patch
22520
9d4ebb75de53 mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22519
diff changeset
540 # Date 3 0
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
541 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
542
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
543 0: 758bd2596a39 [mq]: 1.patch - test - 3.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
544 ==== qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
545 adding 1
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
546 # HG changeset patch
22520
9d4ebb75de53 mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22519
diff changeset
547 # Date 3 0
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
548 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
549
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
550 diff -r ... 1
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
551 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
552 +++ b/1
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
553 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
554 +1
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
555 0: 8c640e9949a8 [mq]: 1.patch - test - 3.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
556 ==== qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
557 # HG changeset patch
22520
9d4ebb75de53 mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22519
diff changeset
558 # Date 4 0
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
559 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
560
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
561 diff -r ... 1
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
562 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
563 +++ b/1
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
564 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
565 +1
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
566 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
567 ==== qnew
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
568 adding 2
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
569 # HG changeset patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
570 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
571
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
572 diff -r ... 2
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
573 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
574 +++ b/2
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
575 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
576 +2
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
577 1: fc7e8a2f6499 [mq]: 2.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
578 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
579 ==== qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
580 # HG changeset patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
581 # Date 5 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
582 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
583
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
584 diff -r ... 2
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
585 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
586 +++ b/2
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
587 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
588 +2
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
589 1: 1d9a6a118fd1 [mq]: 2.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
590 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
591 popping 2.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
592 now at: 1.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
593 ==== qnew -d -m
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
594 # HG changeset patch
22520
9d4ebb75de53 mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22519
diff changeset
595 # Date 6 0
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
596 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
597 Three
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
598
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
599 1: 2a9ef0bdefba Three - test - 6.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
600 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
601 ==== qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
602 adding 3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
603 # HG changeset patch
22520
9d4ebb75de53 mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22519
diff changeset
604 # Date 6 0
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
605 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
606 Three
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
607
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
608 diff -r ... 3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
609 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
610 +++ b/3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
611 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
612 +3
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
613 1: 7f19ad9eea7b Three - test - 6.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
614 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
615 ==== qref -m
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
616 # HG changeset patch
22520
9d4ebb75de53 mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22519
diff changeset
617 # Date 6 0
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
618 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
619 Drei
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
620
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
621 diff -r ... 3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
622 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
623 +++ b/3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
624 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
625 +3
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
626 1: 7ff7377793e3 Drei - test - 6.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
627 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
628 ==== qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
629 # HG changeset patch
22520
9d4ebb75de53 mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22519
diff changeset
630 # Date 7 0
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
631 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
632 Drei
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
633
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
634 diff -r ... 3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
635 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
636 +++ b/3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
637 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
638 +3
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
639 1: d89d3144f518 Drei - test - 7.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
640 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
641 ==== qref -d -m
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
642 # HG changeset patch
22520
9d4ebb75de53 mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22519
diff changeset
643 # Date 8 0
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
644 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
645 Three (again)
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
646
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
647 diff -r ... 3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
648 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
649 +++ b/3
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
650 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
651 +3
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
652 1: b1b6b0fe0e6d Three (again) - test - 8.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
653 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
654 ==== qnew -m
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
655 adding 4
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
656 # HG changeset patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
657 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
658 Four
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
659
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
660 diff -r ... 4
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
661 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
662 +++ b/4
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
663 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
664 +4
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
665 2: 74ded07d166b Four - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
666 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
667 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
668 ==== qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
669 # HG changeset patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
670 # Date 9 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
671 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
672 Four
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
673
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
674 diff -r ... 4
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
675 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
676 +++ b/4
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
677 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
678 +4
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
679 2: 1a651320cf8e Four - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
680 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
681 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
682 popping 4.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
683 now at: 3.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
684 ==== qnew with HG header
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
685 popping 5.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
686 now at: 3.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
687 # HG changeset patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
688 # Date 10 0
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
689 2: d16a272220d2 imported patch 5.patch - test - 10.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
690 1: b1b6b0fe0e6d Three (again) - test - 8.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
691 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
692 ==== hg qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
693 adding 5
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
694 # HG changeset patch
22546
aac5482db318 mq: refactor patchheader header ordering to match export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22520
diff changeset
695 # Date 10 0
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
696 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
697
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
698 diff -r ... 5
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
699 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
700 +++ b/5
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
701 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
702 +5
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
703 2: 5dbf69c07df9 [mq]: 5.patch - test - 10.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
704 1: b1b6b0fe0e6d Three (again) - test - 8.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
705 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
706 ==== hg qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
707 # HG changeset patch
22546
aac5482db318 mq: refactor patchheader header ordering to match export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22520
diff changeset
708 # Date 11 0
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
709 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
710
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
711 diff -r ... 5
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
712 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
713 +++ b/5
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
714 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
715 +5
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
716 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
717 1: b1b6b0fe0e6d Three (again) - test - 8.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
718 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
719 ==== qnew with plain header
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
720 popping 6.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
721 now at: 5.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
722 now at: 6.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
723 Date: 12 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
724
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
725 3: 8ad9ebc22b96 imported patch 6.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
726 2: 049de6af0c1d [mq]: 5.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
727 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
728 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
729 ==== hg qref
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
730 adding 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
731 Date: 12 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
732
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
733 diff -r ... 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
734 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
735 +++ b/6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
736 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
737 +6
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
738 3: 038c46b02a56 [mq]: 6.patch - test - 12.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
739 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
740 1: b1b6b0fe0e6d Three (again) - test - 8.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
741 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
742 ==== hg qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
743 Date: 13 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
744
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
745 diff -r ... 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
746 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
747 +++ b/6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
748 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
749 +6
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
750 3: 2785642ea4b4 [mq]: 6.patch - test - 13.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
751 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
752 1: b1b6b0fe0e6d Three (again) - test - 8.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
753 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
754 popping 6.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
755 now at: 5.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
756 ==== qnew -u
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
757 adding 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
758 # HG changeset patch
22520
9d4ebb75de53 mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22519
diff changeset
759 # User jane
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
760 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
761
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
762 diff -r ... 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
763 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
764 +++ b/6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
765 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
766 +6
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
767 3: a05a33f187ce [mq]: 6.patch - jane
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
768 2: 049de6af0c1d [mq]: 5.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
769 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
770 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
771 ==== qref -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
772 # HG changeset patch
22546
aac5482db318 mq: refactor patchheader header ordering to match export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22520
diff changeset
773 # User jane
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
774 # Date 12 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
775 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
776
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
777 diff -r ... 6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
778 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
779 +++ b/6
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
780 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
781 +6
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
782 3: 5702c529dfe9 [mq]: 6.patch - jane
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
783 2: 049de6af0c1d [mq]: 5.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
784 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
785 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
786 popping 6.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
787 now at: 5.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
788 ==== qnew -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
789 adding 7
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
790 # HG changeset patch
22520
9d4ebb75de53 mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22519
diff changeset
791 # Date 13 0
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
792 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
793
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
794 diff -r ... 7
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
795 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
796 +++ b/7
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
797 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
798 +7
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
799 3: 8dd1eb8d4132 [mq]: 7.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
800 2: 049de6af0c1d [mq]: 5.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
801 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
802 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
803 ==== qref -u
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
804 # HG changeset patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
805 # User john
22520
9d4ebb75de53 mq: write headers for new HG patches in the same order as export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22519
diff changeset
806 # Date 13 0
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
807 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
808
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
809 diff -r ... 7
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
810 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
811 +++ b/7
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
812 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
813 +7
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
814 3: 4f9d07369cc4 [mq]: 7.patch - john - 13.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
815 2: 049de6af0c1d [mq]: 5.patch - test - 11.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
816 1: b1b6b0fe0e6d Three (again) - test - 8.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
817 0: 4a67dfeea974 [mq]: 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
818 ==== qnew
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
819 adding 8
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
820 # HG changeset patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
821 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
822
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
823 diff -r ... 8
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
824 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
825 +++ b/8
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
826 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
827 +8
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
828 4: 868b62f09492 [mq]: 8.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
829 3: 4f9d07369cc4 [mq]: 7.patch - john
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
830 2: 049de6af0c1d [mq]: 5.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
831 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
832 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
833 ==== qref -u -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
834 # HG changeset patch
22546
aac5482db318 mq: refactor patchheader header ordering to match export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22520
diff changeset
835 # User john
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
836 # Date 14 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
837 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
838
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
839 diff -r ... 8
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
840 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
841 +++ b/8
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
842 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
843 +8
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
844 4: b1e878ae55b9 [mq]: 8.patch - john
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
845 3: 4f9d07369cc4 [mq]: 7.patch - john
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
846 2: 049de6af0c1d [mq]: 5.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
847 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
848 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
849 popping 8.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
850 now at: 7.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
851 ==== qnew -m
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
852 adding 9
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
853 # HG changeset patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
854 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
855 Nine
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
856
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
857 diff -r ... 9
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
858 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
859 +++ b/9
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
860 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
861 +9
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
862 4: 7251936ac2bf Nine - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
863 3: 4f9d07369cc4 [mq]: 7.patch - john
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
864 2: 049de6af0c1d [mq]: 5.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
865 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
866 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
867 ==== qref -u -d
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
868 # HG changeset patch
22546
aac5482db318 mq: refactor patchheader header ordering to match export (BC)
Mads Kiilerich <madski@unity3d.com>
parents: 22520
diff changeset
869 # User john
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
870 # Date 15 0
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
871 # Parent
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
872 Nine
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
873
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
874 diff -r ... 9
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
875 --- /dev/null
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
876 +++ b/9
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
877 @@ -0,0 +1,1 @@
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
878 +9
35385
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
879 4: a0de5bf6e9f7 Nine - john
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
880 3: 4f9d07369cc4 [mq]: 7.patch - john
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
881 2: 049de6af0c1d [mq]: 5.patch - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
882 1: b1b6b0fe0e6d Three (again) - test
469b06b4c3ca tests: add commit hashes to log commands in rebase tests
Phil Cohen <phillco@fb.com>
parents: 23442
diff changeset
883 0: 4a67dfeea974 [mq]: 1.patch - test
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
884 popping 9.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
885 now at: 7.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
886 ==== qpop -a / qpush -a
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
887 popping 7.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
888 popping 5.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
889 popping 3.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
890 popping 1.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
891 patch queue now empty
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
892 applying 1.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
893 applying 3.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
894 applying 5.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
895 applying 7.patch
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
896 now at: 7.patch
38299
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
897 3: d26a5b7ffce1 imported patch 7.patch - john - 13.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
898 2: dda6cf77060a imported patch 5.patch - test - 11.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
899 1: 25e32d66c8c7 Three (again) - test - 8.00
88e7105b5cd9 templater: restore the original string format of {date}
Yuya Nishihara <yuya@tcha.org>
parents: 38285
diff changeset
900 0: e5011c0211fe imported patch 1.patch - test - 4.00
12461
4a86b30de425 tests: unify test-mq-header-date
Matt Mackall <mpm@selenic.com>
parents: 10397
diff changeset
901 $ rm -r sandbox