~ubuntu-branches/ubuntu/precise/mercurial/precise-updates

« back to all changes in this revision

Viewing changes to tests/test-qrecord.t

  • Committer: Bazaar Package Importer
  • Author(s): Javi Merino
  • Date: 2011-03-06 16:01:58 UTC
  • mto: (28.1.2 sid) (1.1.14)
  • mto: This revision was merged to the branch mainline in revision 32.
  • Revision ID: james.westby@ubuntu.com-20110306160158-y94pzpmtd7b1xgjk
Tags: upstream-1.8
ImportĀ upstreamĀ versionĀ 1.8

Show diffs side-by-side

added added

removed removed

Lines of Context:
158
158
  -2
159
159
  +2 2
160
160
   3
161
 
  record change 1/6 to '1.txt'? [Ynsfdaq?] 
 
161
  record change 1/4 to '1.txt'? [Ynsfdaq?] 
162
162
  @@ -3,3 +3,3 @@
163
163
   3
164
164
  -4
165
165
  +4 4
166
166
   5
167
 
  record change 2/6 to '1.txt'? [Ynsfdaq?] 
 
167
  record change 2/4 to '1.txt'? [Ynsfdaq?] 
168
168
  diff --git a/2.txt b/2.txt
169
169
  1 hunks, 1 lines changed
170
170
  examine changes to '2.txt'? [Ynsfdaq?] 
175
175
   c
176
176
   d
177
177
   e
178
 
  record change 4/6 to '2.txt'? [Ynsfdaq?] 
 
178
  record change 3/4 to '2.txt'? [Ynsfdaq?] 
179
179
  diff --git a/dir/a.txt b/dir/a.txt
180
180
  1 hunks, 1 lines changed
181
181
  examine changes to 'dir/a.txt'? [Ynsfdaq?] 
255
255
  -4
256
256
  +4 4
257
257
   5
258
 
  record change 1/3 to '1.txt'? [Ynsfdaq?] 
 
258
  record change 1/2 to '1.txt'? [Ynsfdaq?] 
259
259
  diff --git a/dir/a.txt b/dir/a.txt
260
260
  1 hunks, 1 lines changed
261
261
  examine changes to 'dir/a.txt'? [Ynsfdaq?] 
265
265
   
266
266
   someone
267
267
   up
268
 
  record change 3/3 to 'dir/a.txt'? [Ynsfdaq?] 
 
268
  record change 2/2 to 'dir/a.txt'? [Ynsfdaq?] 
269
269
 
270
270
After qrecord b.patch 'tip'
271
271