[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Reimporting vendor projects where items have been deleted
From: |
Larry Jones |
Subject: |
Re: Reimporting vendor projects where items have been deleted |
Date: |
Thu, 22 Mar 2001 17:18:12 -0500 (EST) |
Laine Stump writes:
>
> If you want to modify your statement to say "Doing a merge using the
> tags placed on the branch at the time of the last two imports" (or
> something similar), we'll be in complete agreement, but currently the
> merge that cvs suggests does nothing of the sort, so either your
> statement is incorrect, or there is a bug in cvs.
My apologies -- you're absolutely right. You have to use the new
release tag (it's the absence of that tag that indicates that the file
should be deleted). So, instead of suggesting -jNET:yesterday -jNET,
CVS should be suggesting -jNET:yesterday -jSECOND, for example. And it
should suggest it reguardless of whether there are any conflicts or not.
-Larry Jones
Girls are like slugs -- they probably serve some purpose, but
it's hard to imagine what. -- Calvin
- RE: Reimporting vendor projects where items have been deleted, Nathan Herring, 2001/03/20
- Re: Reimporting vendor projects where items have been deleted, Laine Stump, 2001/03/20
- Re: Reimporting vendor projects where items have been deleted, Larry Jones, 2001/03/21
- Re: Reimporting vendor projects where items have been deleted, Laine Stump, 2001/03/21
- Re: Reimporting vendor projects where items have been deleted, Larry Jones, 2001/03/21
- Re: Reimporting vendor projects where items have been deleted, Laine Stump, 2001/03/22
- Re: Reimporting vendor projects where items have been deleted, Larry Jones, 2001/03/22
- Re: Reimporting vendor projects where items have been deleted, Laine Stump, 2001/03/22
- Re: Reimporting vendor projects where items have been deleted,
Larry Jones <=
- Re: Reimporting vendor projects where items have been deleted, Eric Siegerman, 2001/03/22
- Re: Reimporting vendor projects where items have been deleted, Larry Jones, 2001/03/22
- RE: Reimporting vendor projects where items have been deleted, Stephen Rasku, 2001/03/20
- RE: Reimporting vendor projects where items have been deleted, Nathan Herring, 2001/03/20
- Re: Reimporting vendor projects where items have been deleted, Stephen Rasku, 2001/03/20
- RE: Reimporting vendor projects where items have been deleted, Jerry Nairn, 2001/03/22
- RE: Reimporting vendor projects where items have been deleted, Nathan Herring, 2001/03/23