I'm at my wits end. (Subversion merge stupidity)

[Mike Javorski <mj...@spokesoftware.com>]

So I have a repository for my companies website, with two directoryies,
"active" and "webstage", holding the active and staging version of a
website respectivly. Generally the idea is that once changes are
completed on the staging server the lot is merged over to the active
server. This for the most part works well, but every once in a while svn
merge throws me for a loop.

Some architecture details:
Server: Redhat 9.x + patches + Summer's Subversion/Neon/Apache RPMS
(1.0.5)
Client: Gentoo w/ subversion-1.0.6 ebuild, using command line for
everything


There is two problems, one is really annoying/frustrating, the other is
just annoying:

Problem #1:
===================

We go through the following steps:

- mkdir webstage/demo, insert some stuff into the new dir, commit
.
. Other stuff happens here that is irrelevent to this example
.
- mkdir active/demo, insert some other stuff into the new dir, commit
- change some files in webstage/demo and commit
.
. Now it gets interesting.
.

Re: I'm at my wits end. (Subversion merge stupidity)

[Jacob Atzen <ja...@aub.dk>]

On Tue, Aug 03, 2004 at 06:16:29PM -0700, Mike Javorski wrote:
> We go through the following steps:
> 
> - mkdir webstage/demo, insert some stuff into the new dir, commit
> .
> . Other stuff happens here that is irrelevent to this example
> .
> - mkdir active/demo, insert some other stuff into the new dir, commit
> - change some files in webstage/demo and commit
> .
> . Now it gets interesting.
> .
> >From active, run svn merge ./@HEAD ../webstage@HEAD and what do I see

I'm not sure I understand your setup completely but it seems like you
haven't read the book. Take a look and see if it answers your question:

<http://svnbook.red-bean.com/svnbook/ch04.html>

-- 
Cheers,
- Jacob Atzen


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: I'm at my wits end. (Subversion merge stupidity)

[kf...@collab.net]

"Mike Javorski" <mj...@spokesoftware.com> writes:
> There is two problems, one is really annoying/frustrating, the other is
> just annoying:
> 
> Problem #1:
> ===================
> 
> We go through the following steps:
> 
> - mkdir webstage/demo, insert some stuff into the new dir, commit
> .
> . Other stuff happens here that is irrelevent to this example
> .
> - mkdir active/demo, insert some other stuff into the new dir, commit
> - change some files in webstage/demo and commit
> .
> . Now it gets interesting.
> .
> >From active, run svn merge ./@HEAD ../webstage@HEAD and what do I see
> 
> *SNIP*
> D     demo/file1.html
> D     demo/file2.html
> D  demo
> Svn: Revision 134619188 doesn't match existing revision 339 in 'demo'
> *SNIP*

Wow, do you really have a revision 134619188?

I suspect something funny is going on here.  If you can reproduce this
error reliably (i.e., with a short demo script that creates a
repository from scratch, sets things up appropriately, and then shows
the above behavior -- albeit with different revision numbers, of
course) I'd love to take a look.

> Now active/demo is empty, and the files marked as deleted. This makes no
> sense whatsoever, there should be either a fault, and svn merge should
> fail indicating that it can't determine how to merge, or (preferably)
> should delete the old files and place the merged files in the directory
> like I told it to. I have fixed this in the past by deleting one
> directory, and commiting a fresh copy. Doing that seems to clear the
> issue, but the issue really shouldn't happen to begin with.

Yeah, it doesn't make any sense to me either.  A complete transcript
is what we need here, I think.

> Problem #2:
> ==============
> For some reason (on the same repository as above) svn merge thinks it
> ALWAYS has to merge over some of the image files. When I go to commit
> the directory, it doesn't include them, so that's fine, but the problem
> is it ALWAYS thinks they are out of sync. These image files were copied
> from webstage/ to active/ within svn, but it for some reason still
> thinks there is a versioning delta between them and proceeds to re-copy
> them on each merge attempt. This is not a drastic problem, but it is
> very annoying when you are trying to figure out what files are being
> merged, and for some people on remote, can cause a considerable time
> delay as it recopies the files.

Again, we need a full transcript, showing the commmands you're running
and their output, and anything else you think might possibly be
relevant.

Thanks,
-Karl


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org