| 1 | =head1 NAME |
|---|
| 2 | |
|---|
| 3 | fcm merge |
|---|
| 4 | |
|---|
| 5 | =head1 SYNOPSIS |
|---|
| 6 | |
|---|
| 7 | Merge changes from a source into your working copy. |
|---|
| 8 | |
|---|
| 9 | 1. fcm merge SOURCE |
|---|
| 10 | 2. fcm merge --custom --revision N[:M] SOURCE |
|---|
| 11 | fcm merge --custom URL[\@REV1] URL[\@REV2] |
|---|
| 12 | 3. fcm merge --reverse --revision [M:]N |
|---|
| 13 | |
|---|
| 14 | =over 4 |
|---|
| 15 | |
|---|
| 16 | =item 1. |
|---|
| 17 | |
|---|
| 18 | If neither --custom nor --reverse is specified, the command merges changes |
|---|
| 19 | automatically from SOURCE into your working copy. SOURCE must be a valid |
|---|
| 20 | URL[@REV] of a branch in a standard FCM project. The base of the merge will be |
|---|
| 21 | calculated automatically based on the common ancestor and latest merge |
|---|
| 22 | information between the SOURCE and the branch of the working copy. |
|---|
| 23 | |
|---|
| 24 | =item 2. |
|---|
| 25 | |
|---|
| 26 | If --custom is specified, the command can be used in two forms. |
|---|
| 27 | |
|---|
| 28 | In the first form, it performs a custom merge from the specified changeset(s) of |
|---|
| 29 | SOURCE into your working copy. SOURCE must be a valid URL[@REV] of a branch in |
|---|
| 30 | a standard FCM project. If a single revision is specified, the merge delta is (N |
|---|
| 31 | - 1):N of SOURCE. Otherwise, the merge delta, is N:M of SOURCE, where N < M. |
|---|
| 32 | |
|---|
| 33 | In the second form, it performs a custom merge using the delta between the two |
|---|
| 34 | specified branch URLs. For each URL, if a peg revision is not specified, the |
|---|
| 35 | command will peg the URL with its last changed revision. |
|---|
| 36 | |
|---|
| 37 | =item 3. |
|---|
| 38 | |
|---|
| 39 | If --reverse is specified, the command performs a reverse merge of the |
|---|
| 40 | changeset(s) specified by the --revision=M:N option. If a revision is not |
|---|
| 41 | specified with --rev=M:N, it attempts to merge the delta COMMITTED:(COMMITTED - |
|---|
| 42 | 1). If a single revision N is specified, the merge delta is N:(N - 1). |
|---|
| 43 | Otherwise, the merge delta is M:N, where M > N. Note that you do not have to |
|---|
| 44 | specify a SOURCE for a reverse merge, because the SOURCE should always be the |
|---|
| 45 | branch your working copy is pointing to. |
|---|
| 46 | |
|---|
| 47 | =back |
|---|
| 48 | |
|---|
| 49 | The command provide a commit log message template following the merge. |
|---|
| 50 | |
|---|
| 51 | =head1 OPTIONS |
|---|
| 52 | |
|---|
| 53 | =over 4 |
|---|
| 54 | |
|---|
| 55 | =item --auto-log |
|---|
| 56 | |
|---|
| 57 | In automatic mode, adds the log messages of the merged revisions in the commit |
|---|
| 58 | log. Has no effect in other merge modes. |
|---|
| 59 | |
|---|
| 60 | =item --dry-run |
|---|
| 61 | |
|---|
| 62 | Try operation but make no changes. |
|---|
| 63 | |
|---|
| 64 | =item --non-interactive |
|---|
| 65 | |
|---|
| 66 | Do no interactive prompting. |
|---|
| 67 | |
|---|
| 68 | =item --revision=REV, -r REV |
|---|
| 69 | |
|---|
| 70 | Specify a (range of) revision number(s). |
|---|
| 71 | |
|---|
| 72 | =item --verbose, -v |
|---|
| 73 | |
|---|
| 74 | Print extra information. |
|---|
| 75 | |
|---|
| 76 | =back |
|---|
| 77 | |
|---|
| 78 | =cut |
|---|
