[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: renaming under CVS
From: |
Noel Yap |
Subject: |
Re: renaming under CVS |
Date: |
Tue, 26 Feb 2002 09:05:35 -0800 (PST) |
--- Paul Sander <address@hidden> wrote:
> >--- Forwarded mail from address@hidden
> >In the original scenario both developers were
> working on different
> >branches.
>
> The treatment of renames during merges should work
> the same way
> regardless of whether or not the two developers
> share a branch.
> A 3-way merge is a 3-way merge, and the point here
> is that
> directories should be treated in substantially the
> same way as
> files, with regard to merging changes to their
> contents (i.e.
> the mapping between version histories and the
> location of a
> version in the directory trees).
I agree that a 3-way merge is a 3-way merge, but
directory versioning is an ideal I'm not sure CVS can
achieve. (But the wheels are still churning on this
one).
Noel
__________________________________________________
Do You Yahoo!?
Yahoo! Sports - Coverage of the 2002 Olympic Games
http://sports.yahoo.com
- Re: CVS Update Behaviour, (continued)
- Re: CVS Update Behaviour, Noel Yap, 2002/02/26
- Re: CVS Update Behaviour, Noel Yap, 2002/02/23
- Re: CVS Update Behaviour, Greg A. Woods, 2002/02/24
- Re: renaming under CVS, Noel Yap, 2002/02/24
- Re: renaming under CVS, Mark D. Baushke, 2002/02/25
- Re: renaming under CVS, Mark, 2002/02/25
- Re: renaming under CVS, Paul Sander, 2002/02/26
- Re: renaming under CVS, Noel Yap, 2002/02/25
- Re: renaming under CVS, Greg A. Woods, 2002/02/25
- Re: renaming under CVS, Paul Sander, 2002/02/26
- Re: renaming under CVS,
Noel Yap <=
- Re: renaming under CVS, Greg A. Woods, 2002/02/26
- Re: renaming under CVS, Noel Yap, 2002/02/26
- Re: renaming under CVS, Greg A. Woods, 2002/02/27
- Re: renaming under CVS, Noel Yap, 2002/02/26
- Re: CVS Update Behaviour, Nagy Gabor, 2002/02/25
- Re: CVS Update Behaviour, Noel Yap, 2002/02/22
- Re: renames under CVS, Noel Yap, 2002/02/22
- Re: renames under CVS, Greg A. Woods, 2002/02/22
- Re: renames under CVS, Paul Sander, 2002/02/22
- Re: renames under CVS, Greg A. Woods, 2002/02/22