Mercurial > hg
comparison tests/test-qrecord.out @ 7910:14ec64d41dad
record: Give user a hint about chunk selection progress
It greatly improves usability when one roughly knows where
the chunks of interest are.
author | Rocco Rutte <pdmef@gmx.net> |
---|---|
date | Sat, 28 Mar 2009 23:09:36 +0100 |
parents | f60730693efc |
children | 683d8ebcf434 |
comparison
equal
deleted
inserted
replaced
7909:179fac5c10d8 | 7910:14ec64d41dad |
---|---|
82 examine changes to '1.txt'? [Ynsfdaq?] @@ -1,3 +1,3 @@ | 82 examine changes to '1.txt'? [Ynsfdaq?] @@ -1,3 +1,3 @@ |
83 1 | 83 1 |
84 -2 | 84 -2 |
85 +2 2 | 85 +2 2 |
86 3 | 86 3 |
87 record this change to '1.txt'? [Ynsfdaq?] @@ -3,3 +3,3 @@ | 87 record change 1/6 to '1.txt'? [Ynsfdaq?] @@ -3,3 +3,3 @@ |
88 3 | 88 3 |
89 -4 | 89 -4 |
90 +4 4 | 90 +4 4 |
91 5 | 91 5 |
92 record this change to '1.txt'? [Ynsfdaq?] diff --git a/2.txt b/2.txt | 92 record change 2/6 to '1.txt'? [Ynsfdaq?] diff --git a/2.txt b/2.txt |
93 1 hunks, 2 lines changed | 93 1 hunks, 2 lines changed |
94 examine changes to '2.txt'? [Ynsfdaq?] @@ -1,5 +1,5 @@ | 94 examine changes to '2.txt'? [Ynsfdaq?] @@ -1,5 +1,5 @@ |
95 a | 95 a |
96 -b | 96 -b |
97 +b b | 97 +b b |
98 c | 98 c |
99 d | 99 d |
100 e | 100 e |
101 record this change to '2.txt'? [Ynsfdaq?] diff --git a/dir/a.txt b/dir/a.txt | 101 record change 4/6 to '2.txt'? [Ynsfdaq?] diff --git a/dir/a.txt b/dir/a.txt |
102 1 hunks, 2 lines changed | 102 1 hunks, 2 lines changed |
103 examine changes to 'dir/a.txt'? [Ynsfdaq?] | 103 examine changes to 'dir/a.txt'? [Ynsfdaq?] |
104 % after qrecord a.patch 'tip' | 104 % after qrecord a.patch 'tip' |
105 changeset: 1:5d1ca63427ee | 105 changeset: 1:5d1ca63427ee |
106 tag: qtip | 106 tag: qtip |
161 2 2 | 161 2 2 |
162 3 | 162 3 |
163 -4 | 163 -4 |
164 +4 4 | 164 +4 4 |
165 5 | 165 5 |
166 record this change to '1.txt'? [Ynsfdaq?] diff --git a/dir/a.txt b/dir/a.txt | 166 record change 1/3 to '1.txt'? [Ynsfdaq?] diff --git a/dir/a.txt b/dir/a.txt |
167 1 hunks, 2 lines changed | 167 1 hunks, 2 lines changed |
168 examine changes to 'dir/a.txt'? [Ynsfdaq?] @@ -1,4 +1,4 @@ | 168 examine changes to 'dir/a.txt'? [Ynsfdaq?] @@ -1,4 +1,4 @@ |
169 -hello world | 169 -hello world |
170 +hello world! | 170 +hello world! |
171 | 171 |
172 someone | 172 someone |
173 up | 173 up |
174 record this change to 'dir/a.txt'? [Ynsfdaq?] | 174 record change 3/3 to 'dir/a.txt'? [Ynsfdaq?] |
175 % after qrecord b.patch 'tip' | 175 % after qrecord b.patch 'tip' |
176 changeset: 2:b056198bf878 | 176 changeset: 2:b056198bf878 |
177 tag: qtip | 177 tag: qtip |
178 tag: tip | 178 tag: tip |
179 tag: b.patch | 179 tag: b.patch |