[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: trouble with cvs add
|
From: |
Pierre Asselin |
|
Subject: |
Re: trouble with cvs add |
|
Date: |
Fri, 15 Apr 2005 00:47:50 +0000 (UTC) |
|
User-agent: |
tin/1.6.2-20030910 ("Pabbay") (UNIX) (NetBSD/2.0 (i386)) |
Russ Sherk <address@hidden> wrote:
> Pierre,
> Why so complicated to merge a file from head to a branch? I just ran
> a little test and my recommended method works. Martin has some files
> that exist in HEAD but not in BRANCH_1_2. Since they exist in the
> repo, cvs says 'can't add this file because it exists'. Since it
> already exists, it only has to be merged into BRANCH_1_2:
Duh, yes I do think you're right !
--
pa at panix dot com