subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Lathan Bidwell <lat...@andrews.edu>
Subject Re: Merge trunk and prod directories without workspace
Date Mon, 16 Mar 2015 20:16:33 GMT
On Mon, Mar 16, 2015 at 3:15 PM, Ryan Schmidt <
subversion-2015@ryandesign.com> wrote:

>
> On Mar 16, 2015, at 8:19 AM, Lathan Bidwell wrote:
>
> > I have a content management system running on top of SVN. My web servers
> run a post commit hook that does svn update off of svnlook after every
> commit.
> >
> > I currently have a "Publish" operation which I implement by doing svn
> delete $prod_url && svn cp $trunk_url $prod_url. (both repo urls)
> >
> > This causes problems because the post commit hook triggers a delete of
> the folder on my production web server, and then sometimes takes longer to
> re-download all the content (some folders have some decent media, about
> 15-30 gig).
> >
> > General Question: How can I do this operation without checking out the
> folder to a workspace, and do it in 1 revision?
>
> svnmucc can do it in one revision.


That looks interesting, I haven't seen that before. I will look into that,
hopefully I can find a non-command line equivalent.


>

Or you could use the language bindings.
>

I am using perl SWIG bindings, I believe they are somewhat similar to ...
java's?

But the docs seem to be very action based, and I don't see anything related
to holding a transaction. According to my knowledge there aren't actions
that don't end in a commit if it is working on a repository url.

If I am wrong, please show me these actions / parameters for these
behaviors.


>
> > Are there reasons why there isn't a repo to repo merge action? or could
> that be looked into in future versions?
>
> I'm not sure I understand. What would this action do?
>
Current merge behavior says merge changes from a repository url to my
workspace. So I could checkout out a production branch, and merge in the
committed test branch.

What I'd like is to say: "My production branch is at this repository url,
merge this test repository url into that" there would have to be difference
in the mine / theirs conflict settings. And don't require a workspace to
work in.

Mime
View raw message