[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merging insanity

From: Ian Eure <ieure_at_enotes.com>
Date: 2005-09-01 23:36:52 CEST

On Sep 1, 2005, at 2:16 PM, Hari Kodungallur wrote:

> On 9/1/05, Ian Eure <ieure@enotes.com> wrote:
>
>> Hi. I'm a new SVN user, and I'm having an incredibly hard time
>> getting merging working right. It's vastly different from how CVS
>> handles branching and merging, and there's no documentation covering
>> the differences and how it's supposed to work.
>>
>> It seems that SVN's merging requires you to know the revision at
>> which a file was branched, as well as the latest revision in order to
>> merge. This seems like a lot of work, and I can't believe there isn't
>> an easier way to say "copy all changes made to this file in branch X
>> to this file."
>>
>> Suggestions?
>>
>>
>
> svn log --stop-on-copy <url to branch X>
>
> the last entry of the log will be the revision at which you branched.
> Lets say this number is N
>
> svn merge N:HEAD <url to branch X>
>
> this will merge all changes made in the branch to your working copy
> (note: if you merging to trunk, your working copy is trunk)
>
> do you think this is a lot of work?
>
Yes, it's too much work, and it hinges upon fallible human decisions.
Is there really no simple equivalent to `cvs update -j MY_BRANCH' in
Subversion?

Also, what about merging changes back from a branch into trunk? Since
trunk is likely to have been branched many times, how does one figure
out the correct revision to use in the merge command?

--
Ian Eure
Developer,
eNotes.com LLC
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 1 23:38:47 2005

This is an archived mail posted to the Subversion Users mailing list.