Show More
@@ -282,44 +282,30 b' 1) Create a dummy editor changing 1 to 4' | |||||
282 | > mv tt "$1" |
|
282 | > mv tt "$1" | |
283 | > __EOF__ |
|
283 | > __EOF__ | |
284 |
|
284 | |||
285 | 2) Remove f |
|
285 | 2) Add k | |
286 | $ hg rm f |
|
286 | $ printf "1\n" > k | |
287 | $ hg commit -m "remove f" |
|
287 | $ hg add k | |
|
288 | $ hg commit -m "add k" | |||
288 |
|
289 | |||
289 | 3) Do another commit on top |
|
290 | 3) Use interactive revert with editing (replacing +1 with +42): | |
290 | $ touch k; hg add k |
|
291 | $ printf "0\n2\n" > k | |
291 | $ hg commit -m "add k" |
|
292 | $ HGEDITOR="\"sh\" \"${TESTTMP}/editor.sh\"" hg revert -i <<EOF | |
292 | $ hg st |
|
|||
293 |
|
||||
294 | 4) Use interactive revert to recover f and change it on the fly |
|
|||
295 | $ HGEDITOR="\"sh\" \"${TESTTMP}/editor.sh\"" hg revert -i -r ".^^" <<EOF |
|
|||
296 | > y |
|
293 | > y | |
297 | > e |
|
294 | > e | |
298 | > EOF |
|
295 | > EOF | |
299 | adding f |
|
296 | reverting k | |
300 | removing k |
|
297 | diff --git a/k b/k | |
301 | diff --git a/f b/f |
|
298 | 1 hunks, 2 lines changed | |
302 | new file mode 100644 |
|
299 | examine changes to 'k'? [Ynesfdaq?] y | |
303 | examine changes to 'f'? [Ynesfdaq?] y |
|
|||
304 |
|
300 | |||
305 |
@@ - |
|
301 | @@ -1,2 +1,1 @@ | |
306 | +a |
|
302 | -0 | |
|
303 | -2 | |||
307 | +1 |
|
304 | +1 | |
308 | +2 |
|
305 | record this change to 'k'? [Ynesfdaq?] e | |
309 | +3 |
|
|||
310 | +4 |
|
|||
311 | +5 |
|
|||
312 | +b |
|
|||
313 | record this change to 'f'? [Ynesfdaq?] e |
|
|||
314 |
|
306 | |||
315 |
$ cat |
|
307 | $ cat k | |
316 | a |
|
|||
317 | 42 |
|
308 | 42 | |
318 | 2 |
|
|||
319 | 3 |
|
|||
320 | 4 |
|
|||
321 | 5 |
|
|||
322 | b |
|
|||
323 |
|
309 | |||
324 | Check the experimental config to invert the selection: |
|
310 | Check the experimental config to invert the selection: | |
325 | $ cat <<EOF >> $HGRCPATH |
|
311 | $ cat <<EOF >> $HGRCPATH | |
@@ -332,7 +318,7 b' Check the experimental config to invert ' | |||||
332 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
318 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
333 | $ printf 'firstline\nc\n1\n2\n3\n 3\n5\nd\nlastline\n' > folder1/g |
|
319 | $ printf 'firstline\nc\n1\n2\n3\n 3\n5\nd\nlastline\n' > folder1/g | |
334 | $ hg diff --nodates |
|
320 | $ hg diff --nodates | |
335 |
diff -r |
|
321 | diff -r a3d963a027aa folder1/g | |
336 | --- a/folder1/g |
|
322 | --- a/folder1/g | |
337 | +++ b/folder1/g |
|
323 | +++ b/folder1/g | |
338 | @@ -1,7 +1,9 @@ |
|
324 | @@ -1,7 +1,9 @@ | |
@@ -383,7 +369,7 b' Check the experimental config to invert ' | |||||
383 | record change 3/3 to 'folder1/g'? [Ynesfdaq?] n |
|
369 | record change 3/3 to 'folder1/g'? [Ynesfdaq?] n | |
384 |
|
370 | |||
385 | $ hg diff --nodates |
|
371 | $ hg diff --nodates | |
386 |
diff -r |
|
372 | diff -r a3d963a027aa folder1/g | |
387 | --- a/folder1/g |
|
373 | --- a/folder1/g | |
388 | +++ b/folder1/g |
|
374 | +++ b/folder1/g | |
389 | @@ -5,3 +5,4 @@ |
|
375 | @@ -5,3 +5,4 @@ |
General Comments 0
You need to be logged in to leave comments.
Login now