|
From: | David Munt |
Subject: | cvs merge error |
Date: | Thu, 24 Jul 2003 12:21:01 +0800 |
hello,
i have a problem that has been
causing me a lot of grief as i cannot figure out what is going on.
i have successfully merged a branch into
the trunk in the past but suddenly i am getting an error using the
following command in the directory containing
a working copy of the trunk (i.e. "source").
cvs update -d -P -j
branch-last-merged-tag -j branch-tag source
cvs [update aborted]: only two -j options
can be specified
where "branch-last-merged-tag" is a
normal tag added to "source" when that last merge was completed
and "branch-tag" is the branch tag of the branch.
the command is executed from within a
script file so i'm confident that it is the same command used each time and
cannot think of any changes to the repository that would impact on the
merge.
can you offer any
suggestions?
regards,
david munt
qa manager
surpac minex group
ph: +61 8 9296
1361
|
[Prev in Thread] | Current Thread | [Next in Thread] |