Mercurial > hg
annotate tests/test-qrecord.t @ 29774:a7f8939641aa
merge: use labels in prompts to the user
Now that we persist the labels, we can consistently use the labels in
prompts for the user without risk of confusion. This changes a huge amount
of command output:
This means that merge prompts like:
no tool found to merge a
keep (l)ocal, take (o)ther, or leave (u)nresolved? u
and
remote changed a which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
become:
no tool found to merge a
keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved? u
and
remote [source] changed a which local [dest] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
where "working copy" and "destination" were supplied by the command that
requested the merge as labels for conflict markers, and thus should be
human-friendly.
author | Simon Farnsworth <simonfar@fb.com> |
---|---|
date | Fri, 12 Aug 2016 06:01:42 -0700 |
parents | d001d6d27570 |
children | 7109d5ddeb0c |
rev | line source |
---|---|
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
1 Create configuration |
5933 | 2 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
3 $ echo "[ui]" >> $HGRCPATH |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
4 $ echo "interactive=true" >> $HGRCPATH |
13935
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
5 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
6 help record (no record) |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
7 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
8 $ hg help record |
16854
d71ada5a6a33
help: format all output using RST
Olav Reinert <seroton10@gmail.com>
parents:
16458
diff
changeset
|
9 record extension - commands to interactively select changes for |
28697
d001d6d27570
record: deprecate the extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27729
diff
changeset
|
10 commit/qrefresh (DEPRECATED) |
13935
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
11 |
22113
2d2cb5e50095
help: normalize hint about enabling extensions
Matt Mackall <mpm@selenic.com>
parents:
22111
diff
changeset
|
12 (use "hg help extensions" for information on enabling extensions) |
13935
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
13 |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
14 help qrecord (no record) |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
15 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
16 $ hg help qrecord |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
17 'qrecord' is provided by the following extension: |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
18 |
15861
ee8f5e4ce7b8
minirst: simplify and standardize field list formatting
Olav Reinert <seroton10@gmail.com>
parents:
15521
diff
changeset
|
19 record commands to interactively select changes for commit/qrefresh |
28697
d001d6d27570
record: deprecate the extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27729
diff
changeset
|
20 (DEPRECATED) |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
21 |
22113
2d2cb5e50095
help: normalize hint about enabling extensions
Matt Mackall <mpm@selenic.com>
parents:
22111
diff
changeset
|
22 (use "hg help extensions" for information on enabling extensions) |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
23 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
24 $ echo "[extensions]" >> $HGRCPATH |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
25 $ echo "record=" >> $HGRCPATH |
5933 | 26 |
13935
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
27 help record (record) |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
28 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
29 $ hg help record |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
30 hg record [OPTION]... [FILE]... |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
31 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
32 interactively select changes to commit |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
33 |
27729
58f8b29c37ff
minirst: change hgrole to use single quotes
timeless <timeless@mozdev.org>
parents:
25304
diff
changeset
|
34 If a list of files is omitted, all changes reported by 'hg status' will be |
13935
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
35 candidates for recording. |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
36 |
27729
58f8b29c37ff
minirst: change hgrole to use single quotes
timeless <timeless@mozdev.org>
parents:
25304
diff
changeset
|
37 See 'hg help dates' for a list of formats valid for -d/--date. |
13935
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
38 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
39 You will be prompted for whether to record changes to each modified file, |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
40 and for files with multiple changes, for each change to use. For each |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
41 query, the following responses are possible: |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
42 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
43 y - record this change |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
44 n - skip this change |
16324
46b991a1f428
record: allow splitting of hunks by manually editing patches
A. S. Budden <abudden@gmail.com>
parents:
15861
diff
changeset
|
45 e - edit this change manually |
13935
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
46 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
47 s - skip remaining changes to this file |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
48 f - record remaining changes to this file |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
49 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
50 d - done, skip remaining changes and files |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
51 a - record all changes to all remaining files |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
52 q - quit, recording no changes |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
53 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
54 ? - display help |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
55 |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
56 This command is not available when committing a merge. |
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
57 |
28697
d001d6d27570
record: deprecate the extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27729
diff
changeset
|
58 (use "hg help -e record" to show help for the record extension) |
d001d6d27570
record: deprecate the extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27729
diff
changeset
|
59 |
22117
c1d93edcf004
help: fold repeatable option message into option table header
Matt Mackall <mpm@selenic.com>
parents:
22113
diff
changeset
|
60 options ([+] can be repeated): |
13935
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
61 |
15145
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
62 -A --addremove mark new/missing files as added/removed before |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
63 committing |
25304
9bc11716bc86
commit: improve --close-branch documentation
Matt Mackall <mpm@selenic.com>
parents:
24365
diff
changeset
|
64 --close-branch mark a branch head as closed |
24365
f1eaf03dd608
commands: say "working directory" in full spelling
Yuya Nishihara <yuya@tcha.org>
parents:
22589
diff
changeset
|
65 --amend amend the parent of the working directory |
19445
29c726e9c3ab
tests: update for commit --secret
Matt Mackall <mpm@selenic.com>
parents:
18028
diff
changeset
|
66 -s --secret use the secret phase for committing |
21952
3838b910fa6b
doc: unify help text for "--edit" option
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
67 -e --edit invoke editor on commit messages |
15145
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
68 -I --include PATTERN [+] include names matching the given patterns |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
69 -X --exclude PATTERN [+] exclude names matching the given patterns |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
70 -m --message TEXT use text as commit message |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
71 -l --logfile FILE read commit message from file |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
72 -d --date DATE record the specified date as commit date |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
73 -u --user USER record the specified user as committer |
15321
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
15202
diff
changeset
|
74 -S --subrepos recurse into subrepositories |
15145
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
75 -w --ignore-all-space ignore white space when comparing lines |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
76 -b --ignore-space-change ignore changes in the amount of white space |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
77 -B --ignore-blank-lines ignore changes whose lines are all blank |
13935
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
78 |
22110
26f7c8033bed
help: tweak --verbose command help hint
Matt Mackall <mpm@selenic.com>
parents:
21952
diff
changeset
|
79 (some details hidden, use --verbose to show complete help) |
13935
6e6d19738df9
record: improve help test coverage
timeless <timeless@mozdev.org>
parents:
13295
diff
changeset
|
80 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
81 help (no mq, so no qrecord) |
5933 | 82 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
83 $ hg help qrecord |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
84 hg qrecord [OPTION]... PATCH [FILE]... |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
85 |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
86 interactively record a new patch |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
87 |
27729
58f8b29c37ff
minirst: change hgrole to use single quotes
timeless <timeless@mozdev.org>
parents:
25304
diff
changeset
|
88 See 'hg help qnew' & 'hg help record' for more information and usage. |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
89 |
22110
26f7c8033bed
help: tweak --verbose command help hint
Matt Mackall <mpm@selenic.com>
parents:
21952
diff
changeset
|
90 (some details hidden, use --verbose to show complete help) |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
91 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
92 $ hg init a |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
93 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
94 qrecord (mq not present) |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
95 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
96 $ hg -R a qrecord |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
97 hg qrecord: invalid arguments |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
98 hg qrecord [OPTION]... PATCH [FILE]... |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
99 |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
100 interactively record a new patch |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
101 |
22111
aa5e256839d5
help: improve command summary hint
Matt Mackall <mpm@selenic.com>
parents:
22110
diff
changeset
|
102 (use "hg qrecord -h" to show more help) |
13936
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
103 [255] |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
104 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
105 qrecord patch (mq not present) |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
106 |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
107 $ hg -R a qrecord patch |
f4e4faa92939
qrecord: provide help when mq is not enabled
timeless <timeless@mozdev.org>
parents:
13935
diff
changeset
|
108 abort: 'mq' extension not loaded |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12075
diff
changeset
|
109 [255] |
5933 | 110 |
14415
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
111 help (bad mq) |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
112 |
17492 | 113 $ echo "mq=nonexistent" >> $HGRCPATH |
14415
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
114 $ hg help qrecord |
18028
5dbefa846903
tests: don't hardcode errno==2 for ENOENT
Julien Cristau <julien.cristau@logilab.fr>
parents:
17837
diff
changeset
|
115 *** failed to import extension mq from nonexistent: [Errno *] * (glob) |
14415
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
116 hg qrecord [OPTION]... PATCH [FILE]... |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
117 |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
118 interactively record a new patch |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
119 |
27729
58f8b29c37ff
minirst: change hgrole to use single quotes
timeless <timeless@mozdev.org>
parents:
25304
diff
changeset
|
120 See 'hg help qnew' & 'hg help record' for more information and usage. |
14415
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
121 |
22110
26f7c8033bed
help: tweak --verbose command help hint
Matt Mackall <mpm@selenic.com>
parents:
21952
diff
changeset
|
122 (some details hidden, use --verbose to show complete help) |
14415
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
123 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
124 help (mq present) |
5933 | 125 |
17492 | 126 $ sed 's/mq=nonexistent/mq=/' $HGRCPATH > hgrc.tmp |
14415
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
127 $ mv hgrc.tmp $HGRCPATH |
c238b12a1ed4
extensions: raise when trying to find an extension that failed to load
Idan Kamara <idankk86@gmail.com>
parents:
14016
diff
changeset
|
128 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
129 $ hg help qrecord |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
130 hg qrecord [OPTION]... PATCH [FILE]... |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
131 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
132 interactively record a new patch |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
133 |
27729
58f8b29c37ff
minirst: change hgrole to use single quotes
timeless <timeless@mozdev.org>
parents:
25304
diff
changeset
|
134 See 'hg help qnew' & 'hg help record' for more information and usage. |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
135 |
22117
c1d93edcf004
help: fold repeatable option message into option table header
Matt Mackall <mpm@selenic.com>
parents:
22113
diff
changeset
|
136 options ([+] can be repeated): |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
137 |
21952
3838b910fa6b
doc: unify help text for "--edit" option
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21021
diff
changeset
|
138 -e --edit invoke editor on commit messages |
15145
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
139 -g --git use git extended diff format |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
140 -U --currentuser add "From: <current user>" to patch |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
141 -u --user USER add "From: <USER>" to patch |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
142 -D --currentdate add "Date: <current date>" to patch |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
143 -d --date DATE add "Date: <DATE>" to patch |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
144 -I --include PATTERN [+] include names matching the given patterns |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
145 -X --exclude PATTERN [+] exclude names matching the given patterns |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
146 -m --message TEXT use text as commit message |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
147 -l --logfile FILE read commit message from file |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
148 -w --ignore-all-space ignore white space when comparing lines |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
149 -b --ignore-space-change ignore changes in the amount of white space |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
150 -B --ignore-blank-lines ignore changes whose lines are all blank |
ff26712a0c50
help: use RST to format option lists
Matt Mackall <mpm@selenic.com>
parents:
14597
diff
changeset
|
151 --mq operate on patch repository |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
152 |
22110
26f7c8033bed
help: tweak --verbose command help hint
Matt Mackall <mpm@selenic.com>
parents:
21952
diff
changeset
|
153 (some details hidden, use --verbose to show complete help) |
5933 | 154 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
155 $ cd a |
5933 | 156 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
157 Base commit |
5933 | 158 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
159 $ cat > 1.txt <<EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
160 > 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
161 > 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
162 > 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
163 > 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
164 > 5 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
165 > EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
166 $ cat > 2.txt <<EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
167 > a |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
168 > b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
169 > c |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
170 > d |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
171 > e |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
172 > f |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
173 > EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
174 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
175 $ mkdir dir |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
176 $ cat > dir/a.txt <<EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
177 > hello world |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
178 > |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
179 > someone |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
180 > up |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
181 > there |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
182 > loves |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
183 > me |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
184 > EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
185 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
186 $ hg add 1.txt 2.txt dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
187 $ hg commit -m 'initial checkin' |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
188 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
189 Changing files |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
190 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
191 $ sed -e 's/2/2 2/;s/4/4 4/' 1.txt > 1.txt.new |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
192 $ sed -e 's/b/b b/' 2.txt > 2.txt.new |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
193 $ sed -e 's/hello world/hello world!/' dir/a.txt > dir/a.txt.new |
5933 | 194 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
195 $ mv -f 1.txt.new 1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
196 $ mv -f 2.txt.new 2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
197 $ mv -f dir/a.txt.new dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
198 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
199 Whole diff |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
200 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
201 $ hg diff --nodates |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
202 diff -r 1057167b20ef 1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
203 --- a/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
204 +++ b/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
205 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
206 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
207 -2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
208 +2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
209 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
210 -4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
211 +4 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
212 5 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
213 diff -r 1057167b20ef 2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
214 --- a/2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
215 +++ b/2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
216 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
217 a |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
218 -b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
219 +b b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
220 c |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
221 d |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
222 e |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
223 diff -r 1057167b20ef dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
224 --- a/dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
225 +++ b/dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
226 @@ -1,4 +1,4 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
227 -hello world |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
228 +hello world! |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
229 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
230 someone |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
231 up |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
232 |
14424
4eb88d296f63
record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents:
14415
diff
changeset
|
233 qrecord with bad patch name, should abort before prompting |
4eb88d296f63
record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents:
14415
diff
changeset
|
234 |
4eb88d296f63
record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents:
14415
diff
changeset
|
235 $ hg qrecord .hg |
4eb88d296f63
record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents:
14415
diff
changeset
|
236 abort: patch name cannot begin with ".hg" |
4eb88d296f63
record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents:
14415
diff
changeset
|
237 [255] |
4eb88d296f63
record: check patch name is valid before prompting in qrecord
Idan Kamara <idankk86@gmail.com>
parents:
14415
diff
changeset
|
238 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
239 qrecord a.patch |
5933 | 240 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
241 $ hg qrecord -d '0 0' -m aaa a.patch <<EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
242 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
243 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
244 > n |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
245 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
246 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
247 > n |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
248 > EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
249 diff --git a/1.txt b/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
250 2 hunks, 2 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
251 examine changes to '1.txt'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
252 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
253 @@ -1,3 +1,3 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
254 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
255 -2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
256 +2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
257 3 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
258 record change 1/4 to '1.txt'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
259 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
260 @@ -3,3 +3,3 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
261 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
262 -4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
263 +4 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
264 5 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
265 record change 2/4 to '1.txt'? [Ynesfdaq?] n |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
266 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
267 diff --git a/2.txt b/2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
268 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
269 examine changes to '2.txt'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
270 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
271 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
272 a |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
273 -b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
274 +b b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
275 c |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
276 d |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
277 e |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
278 record change 3/4 to '2.txt'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
279 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
280 diff --git a/dir/a.txt b/dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
281 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
282 examine changes to 'dir/a.txt'? [Ynesfdaq?] n |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
283 |
5933 | 284 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
285 After qrecord a.patch 'tip'" |
5933 | 286 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
287 $ hg tip -p |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
288 changeset: 1:5d1ca63427ee |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
289 tag: a.patch |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
290 tag: qbase |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
291 tag: qtip |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
292 tag: tip |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
293 user: test |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
294 date: Thu Jan 01 00:00:00 1970 +0000 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
295 summary: aaa |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
296 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
297 diff -r 1057167b20ef -r 5d1ca63427ee 1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
298 --- a/1.txt Thu Jan 01 00:00:00 1970 +0000 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
299 +++ b/1.txt Thu Jan 01 00:00:00 1970 +0000 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
300 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
301 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
302 -2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
303 +2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
304 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
305 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
306 5 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
307 diff -r 1057167b20ef -r 5d1ca63427ee 2.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
308 --- a/2.txt Thu Jan 01 00:00:00 1970 +0000 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
309 +++ b/2.txt Thu Jan 01 00:00:00 1970 +0000 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
310 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
311 a |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
312 -b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
313 +b b |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
314 c |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
315 d |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
316 e |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
317 |
5933 | 318 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
319 After qrecord a.patch 'diff'" |
5933 | 320 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
321 $ hg diff --nodates |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
322 diff -r 5d1ca63427ee 1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
323 --- a/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
324 +++ b/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
325 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
326 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
327 2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
328 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
329 -4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
330 +4 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
331 5 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
332 diff -r 5d1ca63427ee dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
333 --- a/dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
334 +++ b/dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
335 @@ -1,4 +1,4 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
336 -hello world |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
337 +hello world! |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
338 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
339 someone |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
340 up |
5933 | 341 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
342 qrecord b.patch |
5933 | 343 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
344 $ hg qrecord -d '0 0' -m bbb b.patch <<EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
345 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
346 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
347 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
348 > y |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
349 > EOF |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
350 diff --git a/1.txt b/1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
351 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
352 examine changes to '1.txt'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
353 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
354 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
355 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
356 2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
357 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
358 -4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
359 +4 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
360 5 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
361 record change 1/2 to '1.txt'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
362 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
363 diff --git a/dir/a.txt b/dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
364 1 hunks, 1 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
365 examine changes to 'dir/a.txt'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
366 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
367 @@ -1,4 +1,4 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
368 -hello world |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
369 +hello world! |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
370 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
371 someone |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
372 up |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
373 record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
22117
diff
changeset
|
374 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
375 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
376 After qrecord b.patch 'tip' |
5933 | 377 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
378 $ hg tip -p |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
379 changeset: 2:b056198bf878 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
380 tag: b.patch |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
381 tag: qtip |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
382 tag: tip |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
383 user: test |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
384 date: Thu Jan 01 00:00:00 1970 +0000 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
385 summary: bbb |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
386 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
387 diff -r 5d1ca63427ee -r b056198bf878 1.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
388 --- a/1.txt Thu Jan 01 00:00:00 1970 +0000 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
389 +++ b/1.txt Thu Jan 01 00:00:00 1970 +0000 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
390 @@ -1,5 +1,5 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
391 1 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
392 2 2 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
393 3 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
394 -4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
395 +4 4 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
396 5 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
397 diff -r 5d1ca63427ee -r b056198bf878 dir/a.txt |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
398 --- a/dir/a.txt Thu Jan 01 00:00:00 1970 +0000 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
399 +++ b/dir/a.txt Thu Jan 01 00:00:00 1970 +0000 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
400 @@ -1,4 +1,4 @@ |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
401 -hello world |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
402 +hello world! |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
403 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
404 someone |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
405 up |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
406 |
5933 | 407 |
12075
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
408 After qrecord b.patch 'diff' |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
409 |
f585c9bb85c1
tests: unify test-qrecord
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
8167
diff
changeset
|
410 $ hg diff --nodates |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16854
diff
changeset
|
411 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16854
diff
changeset
|
412 $ cd .. |