merging code in two separate directories

[dave fournier <ot...@otter-rsch.com>]

Hi,

I am a complete newbie with subversion.
I have a project with two branches and the
source files lie in two different directories.
I would like to merge the two. My old approach would be
to run diffs by hand and reconcile the differences.
(There will be a lot of them.)

My questions are:

1.) Is there a better way with subversion to do this?

2.) If so  a quick sketch of how to go about this would be very useful.

   Thanks,

    Dave



-- 
David A. Fournier
P.O. Box 2040,
Sidney, B.C. V8l 3S3
Canada
Phone/FAX 250-655-3364
http://otter-rsch.com

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2386539

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].

Re: merging code in two separate directories

[Ryan Schmidt <su...@ryandesign.com>]

On Aug 23, 2009, at 15:43, dave fournier wrote:

> Ryan Schmidt wrote:
>
>> On Aug 23, 2009, at 13:12, dave fournier wrote:
>>
>>> I am a complete newbie with subversion.
>>> I have a project with two branches and the
>>> source files lie in two different directories.
>>> I would like to merge the two. My old approach would be
>>> to run diffs by hand and reconcile the differences.
>>> (There will be a lot of them.)
>>>
>>> My questions are:
>>>
>>> 1.) Is there a better way with subversion to do this?
>>>
>>> 2.) If so  a quick sketch of how to go about this would be very  
>>> useful.
>>
>> Have you already read up on the "svn merge" command? There is a whole
>> chapter on merging in the book.
>
> Yes I also found a numbre of references to various tools.

If you're referring to the svnmerge tool, its use was recommended  
before Subversion gained merge tracking support in Subversion 1.5.

> However it
> appeared to
> deal more with meging two different files such as file_1 in repo 1 and
> file_2 in repo_2
> to file_1 and file_2 in repo_3  rather than
>
>    file_1_version_1 file_2_verison_1 in repo_1 with
>    file_1_version_2 file_2_verison_2 in repo_2
>  into repo_3 and at the same time reconcile all the differences.

Oh. Please confirm: the files you want to merge are in different  
repositories? You didn't mention that initially; you said separate  
directories (I assumed separate directories within the same  
repository). :) If they are really in separate repositories, then  
Subversion has no support for that. You'll have to diff and patch by  
hand.

If you intend to merge things, they must live in the same repository.


P.S: Use Reply All so your reply goes to the list too, not just to me.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2386590

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].

Re: merging code in two separate directories

[Ryan Schmidt <su...@ryandesign.com>]

On Aug 23, 2009, at 13:12, dave fournier wrote:

> I am a complete newbie with subversion.
> I have a project with two branches and the
> source files lie in two different directories.
> I would like to merge the two. My old approach would be
> to run diffs by hand and reconcile the differences.
> (There will be a lot of them.)
>
> My questions are:
>
> 1.) Is there a better way with subversion to do this?
>
> 2.) If so  a quick sketch of how to go about this would be very  
> useful.

Have you already read up on the "svn merge" command? There is a whole  
chapter on merging in the book.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2386564

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].