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

Re: merge changes between trunk and a "branch" (or copy)

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2003-01-17 13:40:24 CET

On Friday, January 17, 2003, at 07:20 AM, Christian van der Leeden
wrote:

> Hi,
>
> ok, I've followed your instructions and it works fine :-)
>
> Now as an addition :-) How do I figure out the
> BEGIN_CHANGES? I've had a comment inside
> the log and could figure out the changes.
>
> How would I otherwise determine the BEGIN_CHANGES,
> the revision when I've done the svn copy?

at the moment, that's how you do it. keep track of what changes you
made to the branch via log entries or post-it notes or whatever.
later, svn will probably keep track of this information itself so that
it can provide better merge support, but it doesn't yet.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jan 17 13:41:08 2003

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