Hi Alexander, I want to merge a branch to trunk ( something similar to svn merge --reintegrate ^my-branch ). how can I do with a working copy ?
I'm using svnkit exposing a svn repository without the need of a working copy. Regards Ignacio Alexander Kitaev-3 wrote: > > Hello Andy, > > > Hi! I'd like to use SVNkit to merge revisions from one branch to > > another within the same repository, without the use of a local > > working copy. > > Is this possible? > > Theoretically it is possible, but performing correct merge requires a > lot of details to be taken into account. For instance you may use SVNKit > to get text diff you'd like to merge, then somehow compose a delta that > could be applied to the target branch. Also you'll have to make sure > that svn:mergeinfo property is properly updated. > > Much easier would be to use SVNKit to do the following: > > 1. check out (or update) branch to the temporary working copy > 2. perform merge into that working copy > 3. commit and optionally delete temporary working copy. > > This way you'll make sure that merge is performed correctly, and > mergeinfo is updated and if you'll keep that temporary working copy, > then updating it to the latest revision will not introduce big overhead. > > Alexander Kitaev, > TMate Software, > http://svnkit.com/ - Java [Sub]Versioning Library! > http://sqljet.com/ - Java SQLite Library! > > On 08-May-10 03:25, Andy Cohen wrote: >> Hi! I'd like to use SVNkit to merge revisions from one branch to another >> within the same repository, without the use of a local working copy. >> >> Is this possible? >> >> Thanks, >> >> Andy Cohen >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: [email protected] >> For additional commands, e-mail: [email protected] >> >> > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > > > -- View this message in context: http://old.nabble.com/Merging-without-a-working-copy.-tp28493037p32969808.html Sent from the SVNKit - Users mailing list archive at Nabble.com.
