Re: Is it possible to merge branch changes in the working directory into trunk working directory only having read-only access to repository?

On Wed, Aug 05, 2009 at 04:42:28PM -0700, Yuri wrote:
> I have a read-only access to the repository and made many changes into a
> very old branch of the project.
> This branch was merged (by others) with the trunk few times.
> How can I merge my changes back to trunk, and then to the current
> version with the minimal efforts?
> 'svn merge' asks me the revision range that I would like to merge into
> trunk (-r XXXX:YYYY), but I can't get a revision number because I can't
> check this branch in. It's only a working copy.

Are you saying that you have uncommitted changes that you want to merge
into a trunk working copy? If so, then svn can't help you because, as
you observed, you can't commit and therefore svn has no way to know
about your changes.

I would just use diff and patch by hand (or the appropriate windows
versions of these tools). This is (basically) what svn does under the
hood anyway.

tyler

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-08-06 17:23:14 CEST