Eclipse Community Forums: Newcomers » Patch between different versions in CVS

Home » Newcomers » Newcomers » Patch between different versions in CVS

Patch between different versions in CVS [message #263662]

Tue, 26 August 2008 07:07

Eclipse User

How is it to create a patch from first project version to second? The project
shared with CVS. I tried to use "Create patch" wizard, but it works only with
local changes.
--
Denis Kostousov
email: denis.kostousovATgmailDOTcom
jabber: denis.kostousovATgmailDOTcom
fingerprint: D32B A253 F678 9EF1 1079 4F5A 52E1 8EEA FAF9 E1F1

Re: Patch between different versions in CVS [message #263665 is a reply to message #263662]

Tue, 26 August 2008 08:02

Eclipse User

Originally posted by: krzysztof.daniel.gmail.com

It is a little bit unusual use case - could you please tell me what are
you trying to do?

I think that it is impossible to create diff file between two
versions...

On Tue, 2008-08-26 at 17:07 +0600, Denis Kostousov wrote:
> How is it to create a patch from first project version to second? The project
> shared with CVS. I tried to use "Create patch" wizard, but it works only with
> local changes.

Re: Patch between different versions in CVS [message #263693 is a reply to message #263662]

Tue, 26 August 2008 10:10

Eclipse User

Originally posted by: eclipse-news.rizzoweb.com

Denis Kostousov wrote:
> How is it to create a patch from first project version to second? The
> project shared with CVS. I tried to use "Create patch" wizard, but it
> works only with local changes.

There is no automatic feature to create a patch between revisions from
the repository. You might be able to simulate it by initiating a merge
from the later version into the older one and choosing the newer files
to overwrite the older ones. Once you bring those changes into your
workspace, you can create a patch and it should (if my thinking is
correct) represent the differences between the newer version and the
older one. this nice thing about the way Eclipse does merging is that
you can preview it safely and even bring merged changes into your
workspace to see and play with them; it does not commit anything until
you tell it to and thus you can easily throw away the merge and get back
to a known good state.

Alternatively, you can use command-line CVS to create the patch, as
described in this earlier thread:
http://dev.eclipse.org/newslists/news.eclipse.tools.jdt/msg2 2573.html

Hope this helps,
Eric

Re: Patch between different versions in CVS [message #263733 is a reply to message #263665]

Wed, 27 August 2008 00:37

Eclipse User

kdaniel пишет:
> It is a little bit unusual use case - could you please tell me what are
> you trying to do?

I have two projects from different repositories. First repo (CVS) is the
master, not my own repo. The second repo (SVN) is my own repo, copy of the
master repo with some my patches. I need to merge the master repo and my own.
I think, it can be do by the following steps:
1. Create patch between two versions from the master
2. Apply the patch to the slave

--
Denis Kostousov
email: denis.kostousovATgmailDOTcom
jabber: denis.kostousovATgmailDOTcom
fingerprint: D32B A253 F678 9EF1 1079 4F5A 52E1 8EEA FAF9 E1F1

Re: Patch between different versions in CVS [message #263768 is a reply to message #263733]

Wed, 27 August 2008 09:15

Eclipse User

I have not tried it but I have an idea. There are plugins like
"BeyondCVS (http://sourceforge.net/projects/beyondcvs)" and
"ExternalDiff (http://sourceforge.net/projects/externaldiff/)". You can
install one of them and provide console diff utility to print difference
which is actually a patch if right parameters are used.

Regards,
Burak

Denis Kostousov wrote:
> kdaniel пишет:
>> It is a little bit unusual use case - could you please tell me what are
>> you trying to do?
>
> I have two projects from different repositories. First repo (CVS) is the
> master, not my own repo. The second repo (SVN) is my own repo, copy of
> the master repo with some my patches. I need to merge the master repo
> and my own.
> I think, it can be do by the following steps:
> 1. Create patch between two versions from the master
> 2. Apply the patch to the slave
>
>

Previous Topic:	How do I turn build off when running "Debug"?
Next Topic:	moving projects around

Goto Forum:

-=] Back to Top [=-

Current Time: Thu Jul 31 15:48:36 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter