bug-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: cvs merge error


From: Paul Edwards
Subject: Re: cvs merge error
Date: Thu, 24 Jul 2003 06:35:42 GMT

"David Munt" <address@hidden> wrote in message news:address@hidden
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

Can you try updating your script to do:

cvs -t update -d ...

and post the exact output, don't just say "last merged tag" etc, use
what is really in the repository.

Also, specify the version you are using, and if it is not 1.11.6,
consider upgrading.

Also don't post in HTML.

BFN.  Paul.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]