[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Merging from one module into another
|
From: |
Jean-Christian Imbeault |
|
Subject: |
RE: Merging from one module into another |
|
Date: |
Thu, 24 Jun 2004 10:00:25 +0900 |
> From: address@hidden
>
> Using your terminology,
> > cvs co A
> > cvs update -j A -j A_DEV
> (Resolve conflicts, if any)
> > cvs commit
That doesn't seem to work. I get:
$ cvs co A
[snip]
$ cvs -n update -j A -j A_DEV
cvs server: WARNING: global `-l' option ignored.
cvs [update aborted]: no such tag A
Maybe I didn't explain correctly but A and A_DEV are not branches. They are
different projects.
Jc