]>
Commit | Line | Data |
---|---|---|
59e6b23a JH |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2005 Junio C Hamano. | |
4 | # | |
5 | ||
190f5323 | 6 | USAGE='[--interactive | -i] [-v] [--onto <newbase>] [<upstream>|--root] [<branch>]' |
031321c6 SE |
7 | LONG_USAGE='git-rebase replaces <branch> with a new branch of the |
8 | same name. When the --onto option is provided the new branch starts | |
9 | out with a HEAD equal to <newbase>, otherwise it is equal to <upstream> | |
10 | It then attempts to create a new commit for each commit from the original | |
11 | <branch> that does not exist in the <upstream> branch. | |
69a60af5 | 12 | |
031321c6 SE |
13 | It is possible that a merge failure will prevent this process from being |
14 | completely automatic. You will have to resolve any such merge failure | |
cc120056 SE |
15 | and run git rebase --continue. Another option is to bypass the commit |
16 | that caused the merge failure with git rebase --skip. To restore the | |
51ef1daa JS |
17 | original <branch> and remove the .git/rebase-apply working files, use the |
18 | command git rebase --abort instead. | |
69a60af5 | 19 | |
031321c6 | 20 | Note that if <branch> is not specified on the command line, the |
702088af | 21 | currently checked out branch is used. |
e646c9c8 | 22 | |
031321c6 | 23 | Example: git-rebase master~1 topic |
e646c9c8 | 24 | |
031321c6 SE |
25 | A---B---C topic A'\''--B'\''--C'\'' topic |
26 | / --> / | |
27 | D---E---F---G master D---E---F---G master | |
e646c9c8 | 28 | ' |
533b7039 JH |
29 | |
30 | SUBDIRECTORY_OK=Yes | |
8f321a39 | 31 | OPTIONS_SPEC= |
ae2b0f15 | 32 | . git-sh-setup |
f9474132 | 33 | set_reflog_action rebase |
7eff28a9 | 34 | require_work_tree |
533b7039 | 35 | cd_to_toplevel |
4282c4fb | 36 | |
c4427656 | 37 | OK_TO_SKIP_PRE_REBASE= |
cc120056 SE |
38 | RESOLVEMSG=" |
39 | When you have resolved this problem run \"git rebase --continue\". | |
40 | If you would prefer to skip this patch, instead run \"git rebase --skip\". | |
41 | To restore the original branch and stop rebasing run \"git rebase --abort\". | |
42 | " | |
e646c9c8 | 43 | unset newbase |
a06f678e | 44 | strategy=recursive |
58634dbf | 45 | do_merge= |
28ed6e7b | 46 | dotest="$GIT_DIR"/rebase-merge |
58634dbf | 47 | prec=4 |
b758789c | 48 | verbose= |
67dad687 | 49 | git_am_opt= |
190f5323 | 50 | rebase_root= |
58634dbf EW |
51 | |
52 | continue_merge () { | |
53 | test -n "$prev_head" || die "prev_head must be defined" | |
54 | test -d "$dotest" || die "$dotest directory does not exist" | |
55 | ||
5be60078 | 56 | unmerged=$(git ls-files -u) |
58634dbf EW |
57 | if test -n "$unmerged" |
58 | then | |
59 | echo "You still have unmerged paths in your index" | |
9b07873a | 60 | echo "did you forget to use git add?" |
66eb64cb | 61 | die "$RESOLVEMSG" |
58634dbf EW |
62 | fi |
63 | ||
889a50e9 | 64 | cmt=`cat "$dotest/current"` |
6848d58c | 65 | if ! git diff-index --quiet --ignore-submodules HEAD -- |
58634dbf | 66 | then |
e637122e | 67 | if ! git commit --no-verify -C "$cmt" |
f0ef0596 EW |
68 | then |
69 | echo "Commit failed, please do not call \"git commit\"" | |
70 | echo "directly, but instead do one of the following: " | |
71 | die "$RESOLVEMSG" | |
72 | fi | |
7afa845e | 73 | printf "Committed: %0${prec}d " $msgnum |
58634dbf | 74 | else |
7afa845e | 75 | printf "Already applied: %0${prec}d " $msgnum |
58634dbf | 76 | fi |
c7965afd | 77 | git rev-list --pretty=oneline -1 "$cmt" | sed -e 's/^[^ ]* //' |
58634dbf | 78 | |
5be60078 | 79 | prev_head=`git rev-parse HEAD^0` |
58634dbf | 80 | # save the resulting commit so we can read-tree on it later |
58634dbf EW |
81 | echo "$prev_head" > "$dotest/prev_head" |
82 | ||
83 | # onto the next patch: | |
84 | msgnum=$(($msgnum + 1)) | |
5887ac82 | 85 | echo "$msgnum" >"$dotest/msgnum" |
58634dbf EW |
86 | } |
87 | ||
88 | call_merge () { | |
889a50e9 | 89 | cmt="$(cat "$dotest/cmt.$1")" |
58634dbf | 90 | echo "$cmt" > "$dotest/current" |
5be60078 | 91 | hd=$(git rev-parse --verify HEAD) |
6fd2f5e6 | 92 | cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD) |
889a50e9 JS |
93 | msgnum=$(cat "$dotest/msgnum") |
94 | end=$(cat "$dotest/end") | |
0bb733c9 | 95 | eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"' |
889a50e9 | 96 | eval GITHEAD_$hd='$(cat "$dotest/onto_name")' |
0bb733c9 SP |
97 | export GITHEAD_$cmt GITHEAD_$hd |
98 | git-merge-$strategy "$cmt^" -- "$hd" "$cmt" | |
58634dbf EW |
99 | rv=$? |
100 | case "$rv" in | |
101 | 0) | |
0bb733c9 | 102 | unset GITHEAD_$cmt GITHEAD_$hd |
9e4bc7dd | 103 | return |
58634dbf EW |
104 | ;; |
105 | 1) | |
b4372ef1 | 106 | git rerere |
66eb64cb | 107 | die "$RESOLVEMSG" |
58634dbf EW |
108 | ;; |
109 | 2) | |
110 | echo "Strategy: $rv $strategy failed, try another" 1>&2 | |
66eb64cb | 111 | die "$RESOLVEMSG" |
58634dbf EW |
112 | ;; |
113 | *) | |
114 | die "Unknown exit code ($rv) from command:" \ | |
115 | "git-merge-$strategy $cmt^ -- HEAD $cmt" | |
116 | ;; | |
117 | esac | |
118 | } | |
119 | ||
6fd2f5e6 JS |
120 | move_to_original_branch () { |
121 | test -z "$head_name" && | |
122 | head_name="$(cat "$dotest"/head-name)" && | |
123 | onto="$(cat "$dotest"/onto)" && | |
124 | orig_head="$(cat "$dotest"/orig-head)" | |
125 | case "$head_name" in | |
126 | refs/*) | |
127 | message="rebase finished: $head_name onto $onto" | |
128 | git update-ref -m "$message" \ | |
129 | $head_name $(git rev-parse HEAD) $orig_head && | |
130 | git symbolic-ref HEAD $head_name || | |
131 | die "Could not move back to $head_name" | |
132 | ;; | |
133 | esac | |
134 | } | |
135 | ||
58634dbf | 136 | finish_rb_merge () { |
6fd2f5e6 | 137 | move_to_original_branch |
58634dbf EW |
138 | rm -r "$dotest" |
139 | echo "All done." | |
140 | } | |
141 | ||
1b1dce4b | 142 | is_interactive () { |
f8cca019 AE |
143 | while test $# != 0 |
144 | do | |
145 | case "$1" in | |
146 | -i|--interactive) | |
147 | interactive_rebase=explicit | |
148 | break | |
149 | ;; | |
150 | -p|--preserve-merges) | |
151 | interactive_rebase=implied | |
152 | ;; | |
153 | esac | |
1b1dce4b | 154 | shift |
f8cca019 AE |
155 | done |
156 | ||
157 | if [ "$interactive_rebase" = implied ]; then | |
158 | GIT_EDITOR=: | |
159 | export GIT_EDITOR | |
160 | fi | |
161 | ||
162 | test -n "$interactive_rebase" || test -f "$dotest"/interactive | |
1b1dce4b JS |
163 | } |
164 | ||
d70b4a8f | 165 | run_pre_rebase_hook () { |
c4427656 NS |
166 | if test -z "$OK_TO_SKIP_PRE_REBASE" && |
167 | test -x "$GIT_DIR/hooks/pre-rebase" | |
d70b4a8f NS |
168 | then |
169 | "$GIT_DIR/hooks/pre-rebase" ${1+"$@"} || { | |
170 | echo >&2 "The pre-rebase hook refused to rebase." | |
171 | exit 1 | |
172 | } | |
173 | fi | |
174 | } | |
175 | ||
9b752a6e SB |
176 | test -f "$GIT_DIR"/rebase-apply/applying && |
177 | die 'It looks like git-am is in progress. Cannot rebase.' | |
178 | ||
1b1dce4b JS |
179 | is_interactive "$@" && exec git-rebase--interactive "$@" |
180 | ||
9b752a6e SB |
181 | if test $# -eq 0 |
182 | then | |
183 | test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || usage | |
184 | test -d "$dotest" -o -f "$GIT_DIR"/rebase-apply/rebasing && | |
185 | die 'A rebase is in progress, try --continue, --skip or --abort.' | |
186 | die "No arguments given and $GIT_DIR/rebase-apply already exists." | |
187 | fi | |
188 | ||
822f7c73 | 189 | while test $# != 0 |
e646c9c8 JH |
190 | do |
191 | case "$1" in | |
c4427656 NS |
192 | --no-verify) |
193 | OK_TO_SKIP_PRE_REBASE=yes | |
194 | ;; | |
031321c6 | 195 | --continue) |
51ef1daa | 196 | test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || |
cd5320f2 SB |
197 | die "No rebase in progress?" |
198 | ||
6848d58c | 199 | git diff-files --quiet --ignore-submodules || { |
06aff47b | 200 | echo "You must edit all merge conflicts and then" |
9b07873a | 201 | echo "mark them as resolved using git add" |
031321c6 | 202 | exit 1 |
06aff47b | 203 | } |
58634dbf EW |
204 | if test -d "$dotest" |
205 | then | |
889a50e9 JS |
206 | prev_head=$(cat "$dotest/prev_head") |
207 | end=$(cat "$dotest/end") | |
208 | msgnum=$(cat "$dotest/msgnum") | |
209 | onto=$(cat "$dotest/onto") | |
58634dbf EW |
210 | continue_merge |
211 | while test "$msgnum" -le "$end" | |
212 | do | |
213 | call_merge "$msgnum" | |
214 | continue_merge | |
215 | done | |
216 | finish_rb_merge | |
217 | exit | |
218 | fi | |
51ef1daa JS |
219 | head_name=$(cat "$GIT_DIR"/rebase-apply/head-name) && |
220 | onto=$(cat "$GIT_DIR"/rebase-apply/onto) && | |
221 | orig_head=$(cat "$GIT_DIR"/rebase-apply/orig-head) && | |
3f735b66 JS |
222 | git am --resolved --3way --resolvemsg="$RESOLVEMSG" && |
223 | move_to_original_branch | |
cc120056 SE |
224 | exit |
225 | ;; | |
226 | --skip) | |
51ef1daa | 227 | test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || |
cd5320f2 SB |
228 | die "No rebase in progress?" |
229 | ||
fb6e4e1f | 230 | git reset --hard HEAD || exit $? |
58634dbf EW |
231 | if test -d "$dotest" |
232 | then | |
b4372ef1 | 233 | git rerere clear |
889a50e9 JS |
234 | prev_head=$(cat "$dotest/prev_head") |
235 | end=$(cat "$dotest/end") | |
236 | msgnum=$(cat "$dotest/msgnum") | |
d5e673b6 | 237 | msgnum=$(($msgnum + 1)) |
889a50e9 | 238 | onto=$(cat "$dotest/onto") |
d5e673b6 EW |
239 | while test "$msgnum" -le "$end" |
240 | do | |
241 | call_merge "$msgnum" | |
242 | continue_merge | |
243 | done | |
244 | finish_rb_merge | |
245 | exit | |
58634dbf | 246 | fi |
51ef1daa JS |
247 | head_name=$(cat "$GIT_DIR"/rebase-apply/head-name) && |
248 | onto=$(cat "$GIT_DIR"/rebase-apply/onto) && | |
249 | orig_head=$(cat "$GIT_DIR"/rebase-apply/orig-head) && | |
6fd2f5e6 JS |
250 | git am -3 --skip --resolvemsg="$RESOLVEMSG" && |
251 | move_to_original_branch | |
031321c6 SE |
252 | exit |
253 | ;; | |
254 | --abort) | |
51ef1daa | 255 | test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || |
cd5320f2 SB |
256 | die "No rebase in progress?" |
257 | ||
b4372ef1 | 258 | git rerere clear |
58634dbf EW |
259 | if test -d "$dotest" |
260 | then | |
6fd2f5e6 | 261 | move_to_original_branch |
cd5320f2 | 262 | else |
51ef1daa | 263 | dotest="$GIT_DIR"/rebase-apply |
6fd2f5e6 | 264 | move_to_original_branch |
58634dbf | 265 | fi |
97b88dd5 | 266 | git reset --hard $(cat "$dotest/orig-head") |
48411d22 | 267 | rm -r "$dotest" |
031321c6 SE |
268 | exit |
269 | ;; | |
e646c9c8 JH |
270 | --onto) |
271 | test 2 -le "$#" || usage | |
272 | newbase="$2" | |
273 | shift | |
274 | ;; | |
58634dbf EW |
275 | -M|-m|--m|--me|--mer|--merg|--merge) |
276 | do_merge=t | |
277 | ;; | |
278 | -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ | |
279 | --strateg=*|--strategy=*|\ | |
280 | -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) | |
281 | case "$#,$1" in | |
282 | *,*=*) | |
8096fae7 | 283 | strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;; |
58634dbf EW |
284 | 1,*) |
285 | usage ;; | |
286 | *) | |
287 | strategy="$2" | |
288 | shift ;; | |
289 | esac | |
290 | do_merge=t | |
291 | ;; | |
b758789c RS |
292 | -v|--verbose) |
293 | verbose=t | |
294 | ;; | |
059f446d BF |
295 | --whitespace=*) |
296 | git_am_opt="$git_am_opt $1" | |
297 | ;; | |
67dad687 | 298 | -C*) |
059f446d | 299 | git_am_opt="$git_am_opt $1" |
67dad687 | 300 | ;; |
190f5323 TR |
301 | --root) |
302 | rebase_root=t | |
303 | ;; | |
e646c9c8 JH |
304 | -*) |
305 | usage | |
306 | ;; | |
307 | *) | |
308 | break | |
309 | ;; | |
310 | esac | |
311 | shift | |
312 | done | |
51b2ead0 | 313 | test $# -gt 2 && usage |
2db8aaec | 314 | |
51ef1daa | 315 | # Make sure we do not have $GIT_DIR/rebase-apply |
58634dbf | 316 | if test -z "$do_merge" |
7f4bd5d8 | 317 | then |
9b752a6e | 318 | if mkdir "$GIT_DIR"/rebase-apply 2>/dev/null |
58634dbf | 319 | then |
51ef1daa | 320 | rmdir "$GIT_DIR"/rebase-apply |
58634dbf EW |
321 | else |
322 | echo >&2 ' | |
9b752a6e SB |
323 | It seems that I cannot create a rebase-apply directory, and |
324 | I wonder if you are in the middle of patch application or another | |
51ef1daa JS |
325 | rebase. If that is not the case, please |
326 | rm -fr '"$GIT_DIR"'/rebase-apply | |
9b752a6e | 327 | and run me again. I am stopping in case you still have something |
51ef1daa | 328 | valuable there.' |
58634dbf EW |
329 | exit 1 |
330 | fi | |
331 | else | |
332 | if test -d "$dotest" | |
333 | then | |
28ed6e7b | 334 | die "previous rebase directory $dotest still exists." \ |
9b752a6e | 335 | 'Try git rebase (--continue | --abort | --skip)' |
58634dbf | 336 | fi |
7f4bd5d8 JH |
337 | fi |
338 | ||
7f59dbbb | 339 | # The tree must be really really clean. |
07e62b73 JK |
340 | if ! git update-index --ignore-submodules --refresh; then |
341 | echo >&2 "cannot rebase: you have unstaged changes" | |
342 | exit 1 | |
343 | fi | |
6848d58c | 344 | diff=$(git diff-index --cached --name-status -r --ignore-submodules HEAD --) |
32d99544 | 345 | case "$diff" in |
07e62b73 JK |
346 | ?*) echo >&2 "cannot rebase: your index contains uncommitted changes" |
347 | echo >&2 "$diff" | |
7f59dbbb JH |
348 | exit 1 |
349 | ;; | |
350 | esac | |
99a92f92 | 351 | |
190f5323 TR |
352 | if test -z "$rebase_root" |
353 | then | |
354 | # The upstream head must be given. Make sure it is valid. | |
355 | upstream_name="$1" | |
356 | shift | |
357 | upstream=`git rev-parse --verify "${upstream_name}^0"` || | |
358 | die "invalid upstream $upstream_name" | |
359 | unset root_flag | |
360 | upstream_arg="$upstream_name" | |
361 | else | |
362 | test -z "$newbase" && die "--root must be used with --onto" | |
363 | unset upstream_name | |
364 | unset upstream | |
365 | root_flag="--root" | |
366 | upstream_arg="$root_flag" | |
367 | fi | |
32d99544 | 368 | |
a1bf91e0 JH |
369 | # Make sure the branch to rebase onto is valid. |
370 | onto_name=${newbase-"$upstream_name"} | |
5be60078 | 371 | onto=$(git rev-parse --verify "${onto_name}^0") || exit |
a1bf91e0 | 372 | |
9a111c91 | 373 | # If a hook exists, give it a chance to interrupt |
190f5323 | 374 | run_pre_rebase_hook "$upstream_arg" "$@" |
9a111c91 | 375 | |
0cb06644 JH |
376 | # If the branch to rebase is given, that is the branch we will rebase |
377 | # $branch_name -- branch being rebased, or HEAD (already detached) | |
378 | # $orig_head -- commit object name of tip of the branch before rebasing | |
379 | # $head_name -- refs/heads/<that-branch> or "detached HEAD" | |
380 | switch_to= | |
59e6b23a | 381 | case "$#" in |
190f5323 | 382 | 1) |
0cb06644 | 383 | # Is it "rebase other $branchname" or "rebase other $commit"? |
190f5323 TR |
384 | branch_name="$1" |
385 | switch_to="$1" | |
0cb06644 | 386 | |
190f5323 TR |
387 | if git show-ref --verify --quiet -- "refs/heads/$1" && |
388 | branch=$(git rev-parse -q --verify "refs/heads/$1") | |
0cb06644 | 389 | then |
190f5323 TR |
390 | head_name="refs/heads/$1" |
391 | elif branch=$(git rev-parse -q --verify "$1") | |
0cb06644 JH |
392 | then |
393 | head_name="detached HEAD" | |
394 | else | |
395 | usage | |
396 | fi | |
e646c9c8 JH |
397 | ;; |
398 | *) | |
0cb06644 | 399 | # Do not need to switch branches, we are already on it. |
bcf31618 JH |
400 | if branch_name=`git symbolic-ref -q HEAD` |
401 | then | |
0cb06644 | 402 | head_name=$branch_name |
bcf31618 JH |
403 | branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'` |
404 | else | |
0cb06644 | 405 | head_name="detached HEAD" |
bcf31618 JH |
406 | branch_name=HEAD ;# detached |
407 | fi | |
0cb06644 | 408 | branch=$(git rev-parse --verify "${branch_name}^0") || exit |
e646c9c8 | 409 | ;; |
59e6b23a | 410 | esac |
0cb06644 | 411 | orig_head=$branch |
59e6b23a | 412 | |
190f5323 TR |
413 | # Now we are rebasing commits $upstream..$branch (or with --root, |
414 | # everything leading up to $branch) on top of $onto | |
e646c9c8 | 415 | |
1308c17b JS |
416 | # Check if we are already based on $onto with linear history, |
417 | # but this should be done only when upstream and onto are the same. | |
5be60078 | 418 | mb=$(git merge-base "$onto" "$branch") |
1308c17b JS |
419 | if test "$upstream" = "$onto" && test "$mb" = "$onto" && |
420 | # linear history? | |
bbf08124 | 421 | ! (git rev-list --parents "$onto".."$branch" | grep " .* ") > /dev/null |
7f4bd5d8 | 422 | then |
0cb06644 JH |
423 | # Lazily switch to the target branch if needed... |
424 | test -z "$switch_to" || git checkout "$switch_to" | |
83c31614 RS |
425 | echo >&2 "Current branch $branch_name is up to date." |
426 | exit 0 | |
7f4bd5d8 JH |
427 | fi |
428 | ||
b758789c RS |
429 | if test -n "$verbose" |
430 | then | |
431 | echo "Changes from $mb to $onto:" | |
fefe49d1 | 432 | # We want color (if set), but no pager |
5be60078 | 433 | GIT_PAGER='' git diff --stat --summary "$mb" "$onto" |
b758789c RS |
434 | fi |
435 | ||
0cb06644 | 436 | # Detach HEAD and reset the tree |
228e2eb6 | 437 | echo "First, rewinding head to replay your work on top of it..." |
324c2c31 | 438 | git checkout -q "$onto^0" || die "could not detach HEAD" |
22e40795 | 439 | git update-ref ORIG_HEAD $branch |
32d99544 | 440 | |
e646c9c8 | 441 | # If the $onto is a proper descendant of the tip of the branch, then |
32d99544 | 442 | # we just fast forwarded. |
83c31614 | 443 | if test "$mb" = "$branch" |
32d99544 | 444 | then |
d587ed13 | 445 | echo >&2 "Fast-forwarded $branch_name to $onto_name." |
6fd2f5e6 | 446 | move_to_original_branch |
32d99544 LS |
447 | exit 0 |
448 | fi | |
449 | ||
190f5323 TR |
450 | if test -n "$rebase_root" |
451 | then | |
452 | revisions="$onto..$orig_head" | |
453 | else | |
454 | revisions="$upstream..$orig_head" | |
455 | fi | |
456 | ||
58634dbf EW |
457 | if test -z "$do_merge" |
458 | then | |
0cb06644 | 459 | git format-patch -k --stdout --full-index --ignore-if-in-upstream \ |
190f5323 | 460 | $root_flag "$revisions" | |
3041c324 | 461 | git am $git_am_opt --rebasing --resolvemsg="$RESOLVEMSG" && |
6fd2f5e6 JS |
462 | move_to_original_branch |
463 | ret=$? | |
51ef1daa JS |
464 | test 0 != $ret -a -d "$GIT_DIR"/rebase-apply && |
465 | echo $head_name > "$GIT_DIR"/rebase-apply/head-name && | |
466 | echo $onto > "$GIT_DIR"/rebase-apply/onto && | |
467 | echo $orig_head > "$GIT_DIR"/rebase-apply/orig-head | |
6fd2f5e6 | 468 | exit $ret |
58634dbf EW |
469 | fi |
470 | ||
471 | # start doing a rebase with git-merge | |
472 | # this is rename-aware if the recursive (default) strategy is used | |
473 | ||
474 | mkdir -p "$dotest" | |
475 | echo "$onto" > "$dotest/onto" | |
0bb733c9 | 476 | echo "$onto_name" > "$dotest/onto_name" |
6fd2f5e6 | 477 | prev_head=$orig_head |
58634dbf | 478 | echo "$prev_head" > "$dotest/prev_head" |
6fd2f5e6 JS |
479 | echo "$orig_head" > "$dotest/orig-head" |
480 | echo "$head_name" > "$dotest/head-name" | |
58634dbf EW |
481 | |
482 | msgnum=0 | |
190f5323 | 483 | for cmt in `git rev-list --reverse --no-merges "$revisions"` |
58634dbf EW |
484 | do |
485 | msgnum=$(($msgnum + 1)) | |
5887ac82 | 486 | echo "$cmt" > "$dotest/cmt.$msgnum" |
58634dbf EW |
487 | done |
488 | ||
5887ac82 JH |
489 | echo 1 >"$dotest/msgnum" |
490 | echo $msgnum >"$dotest/end" | |
58634dbf EW |
491 | |
492 | end=$msgnum | |
493 | msgnum=1 | |
494 | ||
495 | while test "$msgnum" -le "$end" | |
496 | do | |
497 | call_merge "$msgnum" | |
498 | continue_merge | |
499 | done | |
cc120056 | 500 | |
58634dbf | 501 | finish_rb_merge |