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

RE: Understanding copying/replacing

From: Ian P. McCullough <ipmcc_at_pobox.com>
Date: 2004-01-16 20:36:01 CET

Does this allow you to leave certain files that may have been customized?
In other words is there a way to do this to individual files or do you have
to do it a directory at a time?

What I'd really like to do can I guess be described as this: Merge trunk
into branch only when branch has not changed since last merge with trunk.

Ian

--On Friday, January 16, 2004 8:54 PM +0200 Gareth Lennox
<gareth@dwakn.com> wrote:

> We are currently doing this using svn merge. We merge the trunk into our
> working copy of the branch, something like this (not at my work pc at the
> moment...so it could be wrong)
>
> svn merge -r[last-merge-from-trunk]:HEAD url/to/trunk .
>
> We use a script to do this and it stores the [last-merge-from-trunk] value
> in a property which it uses the next time you run the script. It seems to
> work pretty well as only the changes in the trunk since the last time you
> merged are merged into your branch. (and you only have one commit)
>
> Gareth
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 16 21:57:10 2004

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