[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Jacob Atzen <jacob_at_aub.dk>
Date: 2004-08-04 13:24:35 CEST

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
Received on Wed Aug 4 13:25:24 2004

This is an archived mail posted to the Subversion Users mailing list.