Re: Merging insanity

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?

-Hari
SpikeSource Inc.

---------------------------------------------------------------------
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:18:02 2005