Well, I merged twice. The first time, from trunk/ to branch/ (r7), then
I committed changes in branch (r8).
My next step is to merge the changes from branch/ back into trunk/.
On 16 Jul 2003 12:35:27 -0500, cmpilato@collab.net said:
> "Francois Beausoleil" <fbos@users.sourceforge.net> writes:
>
> > Hi !
> >
> > I have a repository in which I am trying to port changes from a branch to
> > trunk. Here's a concise history of the repository:
> > r1: Imported data into trunk/
> > ... (Unrelated changes)
> > r5: Created branch
> > r6: Delete files in trunk/
> > r7: svn merge trunk@5 trunk@6 into branch
> > r8: Update files in branch
> >
> > Now, when I run the following commands, svn gives me conflicts:
> > D:\wc\compta>svn info
> > Path:
> > Url: http://.../trunk/A
> > Revision: 8
> >
> > D:\wc>svn merge http://.../branches/A@7 http://.../branches/A@8
> > C compta.lib
> > C COMPTA.APP
> > C compta.exe
>
> This looks like you merged from the branch into the trunk (not the
> other way around, as your recipe stated). Did you mistype?
>
Developer of Java Gui Builder
http://jgb.sourceforge.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 16 19:40:58 2003