Unfortunatly it is at work and I wont be able to get it until Monday :( Also
the script is in php as that is what I was working in when I needed this...
(and I don't know python yet, and I am working on windows at work :) )
Basically the logic goes like this (inside a wc of the branch):
1. Get the last-merge-from-trunk value from the property (svn propget ...)
2. Update the working copy (svn up)
3. Get the latest revision
This part is kind of a hack as I could not find a way to get the latest
revision easily. It currently takes the last line of the output from #2 and
cuts out the revision number.
4. run the merge using the two revision numbers:
svn merge -r[last-merge-from-trunk]:[latest-revision] url/to/trunk .
5. Update the last-merge-from-trunk property (svn propset ...)
The user must now fix any conflicts etc., and then commit.
I just bashed this script together the other day, and it seems to work quite
nicely. If anyone knows of a better way to perform step 3, please let me
know!
If anyone would like the script, e-mail me and I will send it to you on
Monday.
Gareth
> -----Original Message-----
> From: John Peacock [mailto:jpeacock@rowman.com]
> Sent: 16 January 2004 08:58 PM
> To: Gareth Lennox
> Cc: 'Ian P. McCullough'; users@subversion.tigris.org
> Subject: Re: Understanding copying/replacing
>
> Gareth Lennox wrote:
>
> > 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.
>
> Please post the script, if you can (if only for reference purposes).
>
> John
>
> --
> John Peacock
> Director of Information Research and Technology
> Rowman & Littlefield Publishing Group
> 4501 Forbes Boulevard
> Suite H
> Lanham, MD 20706
> 301-459-3366 x.5010
> fax 301-429-5748
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 16 20:17:38 2004