[cvsnt] RE: merge?

David Somers dsomers at trevezel.com
Thu Jun 2 16:24:59 BST 2005


> David Somers wrote:
> >
> > Here is the command the I run:
> >
> > # cvs commit -m "merge 2.6.0"
> >
> > Here's the head of the .in log
> >
> >
> > Argument prj
> > Argument -m
> > Argument merge 2.6.0
> > Argument --
>
> What is 'prj'?
>
> It's being added to the arguments before the -m so breaking it.  It's
> not one of the files (they're sent after the '--').

As you can see from the command that I run, *I'm* not putting prj on the
command line.

Here's the scenario:

# cd ~/sandpit/wx242
# cvs import -d -ko -I! -m "load 242" prj/wxWidgets WXWIDGETS WX_2_4_2
# cd ~/sandpit/wx260
# cvs import -d -ko -I! -m "load 260" prj/wxWidgets WXWIDGETS WX_2_6_0
# cd ~/tmp
(note ~/tmp is empty)
# cvs co -j WX_2_4_2 -j WX_2_6_0 prj/wxWidgets
(so you end up with ~/tmp/prj/wxWidgets/....
# cvs common -m "merge 2.6.0"

So, for some reason, cvsnt is somehow putting 'prj' onto the list of
arguments.

Cheers,

David.




More information about the cvsnt mailing list