info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: merge a branch which contains a name-changed file


From: Susie (Guangqi) Chen
Subject: Re: merge a branch which contains a name-changed file
Date: Wed, 11 Apr 2001 14:30:14 -0700

One more thing.  I have another branch B which is forked off the HEAD
before the merge (i.e. B still contains the file with old name).   If
the merge removes old name and add the new name, what will happen to the

file when I merge B into HEAD?

Your help is very valuable to me :>
-Susie

----- Original Message -----
From: "Larry Jones" <address@hidden>
To: "Susie" <address@hidden>
Cc: <address@hidden>
Sent: Wednesday, April 11, 2001 10:21 AM
Subject: Re: merge a branch which contains a name-changed file


> Susie writes:
> >
> > On a specifie branch, I change a file's name from "old" to "new"
(the
> > file content is also changed). Next I am going to merge the branch
into
> > the HEAD.
> >
> > I hope to see the file "old" is replaced with "new"  in the HEAD
after
> > the merge. Can I see it?  ( I guess the case is: both files exist,
and I
> > have to remove the file "old" from HEAD)
>
> Assuming you did the rename by removing the old name and adding the
new
> name and then committing those changes, the merge should try to remove

> the old name and add the new name.  (But removing the old name will
fail
> if there were changes on the trunk after the branchpoint which you
will
> have to merge into the new file manually.)
>
> -Larry Jones
>
> I'm a genius. -- Calvin
>







reply via email to

[Prev in Thread] Current Thread [Next in Thread]