[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: tag vs rtag question
From: |
Nick Patavalis |
Subject: |
Re: tag vs rtag question |
Date: |
Thu, 24 Oct 2002 00:12:34 +0300 |
User-agent: |
Mutt/1.4i |
On Wed, Oct 23, 2002 at 01:58:27PM -0700, Shankar Unni wrote:
> > I would think that with the situation above, doing a cvs tag
> > VENDOR_R2_MERGED in the working directory where conflict resolution
> > was finished would be the safest method, to be sure you tagged the
> > resolved files and not something else.
>
> On the other hand, if you have *deleted* a file, cvs tag won't tag the
> repository file. This can lead to interesting "file reappearing in my
> workarea" problems when others update to the tag..
Can you elaborate a bit on this? You mean deleted by the developers
while working in the branch, or while doing conflict resolution in the
trunk?
/npat
--
Dijkstra probably hates me
-- Linus Torvalds, in kernel/sched.c
- Merging from vendor-branch to branch, Nick Patavalis, 2002/10/22
- Re: Merging from vendor-branch to branch, Greg A. Woods, 2002/10/22
- Re: Merging from vendor-branch to branch, Nick Patavalis, 2002/10/22
- Re: Merging from vendor-branch to branch, Greg A. Woods, 2002/10/22
- Re: Merging from vendor-branch to branch, Nick Patavalis, 2002/10/23
- tag vs rtag question, was Re: Merging from vendor-branch to branch, Todd Denniston, 2002/10/23
- Re: tag vs rtag question, Nick Patavalis, 2002/10/23
- Re: tag vs rtag question, Nick Patavalis, 2002/10/23
- RE: tag vs rtag question, Shankar Unni, 2002/10/23
- Re: tag vs rtag question,
Nick Patavalis <=
- RE: tag vs rtag question, Shankar Unni, 2002/10/23
- Re: tag vs rtag question, Nick Patavalis, 2002/10/23