[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Being able to import changes from one branch to an other
From: |
Mark Priest |
Subject: |
Re: Being able to import changes from one branch to an other |
Date: |
Tue, 22 Jul 2003 11:29:32 -0400 |
Damien,
The usual way of applying changes from one branch to another is to use the
cvs merge facility. I would recommend using a merge to push the changes to
the other branch after you commit. Otherwise you are likely to have a mess
when you do get around to merging the changes later since you will be
subverting cvs in a sense.
You can use ExamDiff to generate unix-style diff files. ExamDiff is a
freeware tool that can plug into WinCVS and is available at
http://www.prestosoft.com/ps.asp?page=edp_examdiff.
-Mark
----- Original Message -----
From: "Damien Castelltort" <address@hidden>
To: "address@hidden" <address@hidden>
Sent: Tuesday, July 22, 2003 10:24 AM
Subject: Being able to import changes from one branch to an other
>
> Hi,
>
> I'm working on a specific branch, before committing i would like to create
a
> diff file of all the
> changes I made, so i can apply those changes on the other branch. As far
as
> I remember there is
> a utility called diffutil that does the trick ? where can I find it ? i
need
> to under Win32 system,
> anyone can help ?
>
> Thks
>
> Castelltort Damien
> Technical Lead / Lead Tools Programmer
> Quantic Dream
> http://www.quanticdream.com
>
----------------------------------------------------------------------------
----
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/info-cvs
>