source: branches/UKMO/r6232_tracer_advection/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-merge.pod @ 9295

Last change on this file since 9295 was 9295, checked in by jcastill, 3 years ago

Remove svn keywords

File size: 1.9 KB
Line 
1=head1 NAME
2
3fcm merge
4
5=head1 SYNOPSIS
6
7Merge 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
18If neither --custom nor --reverse is specified, the command merges changes
19automatically from SOURCE into your working copy. SOURCE must be a valid
20URL[@REV] of a branch in a standard FCM project. The base of the merge will be
21calculated automatically based on the common ancestor and latest merge
22information between the SOURCE and the branch of the working copy.
23
24=item 2.
25
26If --custom is specified, the command can be used in two forms.
27 
28In the first form, it performs a custom merge from the specified changeset(s) of
29SOURCE into your working copy. SOURCE must be a valid URL[@REV] of a branch in
30a 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     
33In the second form, it performs a custom merge using the delta between the two
34specified branch URLs. For each URL, if a peg revision is not specified, the
35command will peg the URL with its last changed revision.
36
37=item 3.
38
39If --reverse is specified, the command performs a reverse merge of the
40changeset(s) specified by the --revision option. If a single revision is
41specified, the merge delta is N:(N - 1). Otherwise, the merge delta is M:N,
42where M > N. Note that you do not have to specify a SOURCE for a reverse merge,
43because the SOURCE should always be the branch your working copy is pointing to.
44 
45=back
46
47The command provide a commit log message template following the merge.
48
49=head1 OPTIONS
50
51=over 4
52
53=item --dry-run
54
55Try operation but make no changes.
56
57=item --non-interactive
58
59Do no interactive prompting.
60
61=item -r [--revision] arg
62
63Specify a (range of) revision number(s).
64
65=item --verbose
66
67Print extra information.
68
69=back
70
71=cut
Note: See TracBrowser for help on using the repository browser.