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 _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
- Re: Reimporting vendor projects where items have been delet... Larry Jones
- RE: Reimporting vendor projects where items have been delet... Nathan Herring
- RE: Reimporting vendor projects where items have been delet... Nathan Herring
- Re: Reimporting vendor projects where items have been ... Laine Stump
- Re: Reimporting vendor projects where items have b... Larry Jones
- Re: Reimporting vendor projects where items ha... Laine Stump
- Re: Reimporting vendor projects where item... Larry Jones
- Re: Reimporting vendor projects where... Laine Stump
- Re: Reimporting vendor projects w... Larry Jones
- Re: Reimporting vendor projects w... Laine Stump
- Re: Reimporting vendor projects w... Larry Jones
- Re: Reimporting vendor projects w... Eric Siegerman
- Re: Reimporting vendor projects w... Larry Jones
- RE: Reimporting vendor projects where items have been delet... Stephen Rasku
- Re: Reimporting vendor projects where items have been ... Eric Siegerman
- RE: Reimporting vendor projects where items have been delet... Nathan Herring
- Re: Reimporting vendor projects where items have been delet... Stephen Rasku
- RE: Reimporting vendor projects where items have been delet... Jerry Nairn
- RE: Reimporting vendor projects where items have been delet... Nathan Herring
- Re: Reimporting vendor projects where items have been ... Derek R. Price
- Re: Reimporting vendor projects where items have b... Eric Siegerman