Mercurial > hg
comparison tests/test-record.out @ 11237:feb2a58fc592 stable
record: check that we are not committing a merge before patch selection
It might sound like a good idea to use record to filter changes when merging.
If someone attemps this, it's better to tell her "no" right ahead, before the
patch generation/line selection, so she does not spend time doing it just to
receive a red light after that (sometimes rather long) process.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Mon, 31 May 2010 17:13:15 +0900 |
parents | f2618cacb485 |
children | a5922547b5cc |
comparison
equal
deleted
inserted
replaced
11236:cfa6a726ef6d | 11237:feb2a58fc592 |
---|---|
21 d - done, skip remaining changes and files | 21 d - done, skip remaining changes and files |
22 a - record all changes to all remaining files | 22 a - record all changes to all remaining files |
23 q - quit, recording no changes | 23 q - quit, recording no changes |
24 | 24 |
25 ? - display help | 25 ? - display help |
26 | |
27 This command is not available when committing a merge. | |
26 | 28 |
27 options: | 29 options: |
28 | 30 |
29 -A --addremove mark new/missing files as added/removed before committing | 31 -A --addremove mark new/missing files as added/removed before committing |
30 --close-branch mark a branch as closed, hiding it from the branch list | 32 --close-branch mark a branch as closed, hiding it from the branch list |
567 a | 569 a |
568 a | 570 a |
569 b | 571 b |
570 +c | 572 +c |
571 | 573 |
574 % abort early when a merge is in progress | |
575 1 files updated, 0 files merged, 5 files removed, 0 files unresolved | |
576 marked working directory as branch thatbranch | |
577 created new head | |
578 5 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
579 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
580 (branch merge, don't forget to commit) | |
581 | |
582 abort: cannot partially commit a merge (use hg commit instead) | |
583 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
572 % with win32ext | 584 % with win32ext |
573 diff --git a/subdir/f1 b/subdir/f1 | 585 diff --git a/subdir/f1 b/subdir/f1 |
574 1 hunks, 1 lines changed | 586 1 hunks, 1 lines changed |
575 examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -3,3 +3,4 @@ | 587 examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -3,3 +3,4 @@ |
576 a | 588 a |
577 b | 589 b |
578 c | 590 c |
579 +d | 591 +d |
580 record this change to 'subdir/f1'? [Ynsfdaq?] | 592 record this change to 'subdir/f1'? [Ynsfdaq?] |
581 changeset: 25:5bacc1f6e9cf | 593 changeset: 26:5bacc1f6e9cf |
582 tag: tip | 594 tag: tip |
595 parent: 24:1460f6e47966 | |
583 user: test | 596 user: test |
584 date: Thu Jan 01 00:00:23 1970 +0000 | 597 date: Thu Jan 01 00:00:23 1970 +0000 |
585 summary: w1 | 598 summary: w1 |
586 | 599 |
587 diff -r 1460f6e47966 -r 5bacc1f6e9cf subdir/f1 | 600 diff -r 1460f6e47966 -r 5bacc1f6e9cf subdir/f1 |