Andy Levy <andy.levy <at> gmail.com> writes:
>
> On 5/22/07, MikeW <mw_phil <at> yahoo.co.uk> wrote:
> > Andy Levy <andy.levy <at> gmail.com> writes:
> >
> > >
> > > On 5/22/07, MikeW <mw_phil <at> yahoo.co.uk> wrote:
> > > > I have a version of a source tree in SVN.
> > > >
> > > > I have been supplied with a patched version of the tree, with
> > > > some files and directories added, some deleted, some modified.
> > > >
> > > > I would basically like the new version of the tree to become the
> > > > next revision in SVN, with files & directories added, updated,
> > > > deleted from the repository as appropriate.
> > > >
> > > > What would be the 'best practice' way of achieving this, please ?
> > > > Single commit if possible.
> > >
> > > Treat it like a Vendor Branch and load it in using svn_load_dirs.pl
> > > See
> >
http://svnbook.red-bean.com/en/1.2/svn.advanced.vendorbr.html#svn.advanced.vendorbr.svn_load_dirs
> > >
> >
> > With several changes in filenames and directory names (new hardware)
> > this is one app that would benefit from having a GUI equivalent
> > to allow you to match up renamed files !
> >
> > Would also be handy if you could specify some exceptions to the
> > additions and deletions - I have an extra parallel 'patches' dir -
> > though this could be done by just pruning or adding into the
> > input source tree, of course
>
> If you're being given a "patched version of the tree," why can't you
> have the patch (output of svn diff) sent to you, to apply to your copy
> of the tree directly?
>
I have the patch - but that doesn't get the code back into SVN !
As far as I know, there is no tool that will apply a patch file
intelligently to a repository - and I would still have to tell it
which old-dir-name corresponds to which new-dir-name, etc.
What I would really like is a visual diff type tool showing the repo tree
in one pane and the 'new' source in another.
I could then manually line up renamed files and directories, using
the tool's inbuilt file-diffing to help locate renamed files with
probabilistic matching ;) [I'll be busy !]
Regards,
Mike
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed May 23 10:13:14 2007