You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Francois Beausoleil <fb...@users.sourceforge.net> on 2003/07/16 17:29:13 UTC
svn merge says I have conflicts in repository when files have not been updated ?
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
Why are these files in conflict ? Last time they were updated was in
trunk/, at rev 1. They were not modified in between. There's probably
something I do not understand about branching and merging here...
I am using Subversion
svn, version 0.25.0 (r6433)
compiled Jul 10 2003, 22:05:10
On Win2K SP3.
Thanks !
François
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
Re: svn merge says I have conflicts in repository when files have not been updated ?
Posted by cm...@collab.net.
"Francois Beausoleil" <fb...@users.sourceforge.net> writes:
> 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/.
Oh, oh. Sorry. Misread. Thanks.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn merge says I have conflicts in repository when files have not been updated ?
Posted by Francois Beausoleil <fb...@users.sourceforge.net>.
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" <fb...@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
Re: svn merge says I have conflicts in repository when files have not been updated ?
Posted by cm...@collab.net.
"Francois Beausoleil" <fb...@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?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn merge says I have conflicts in repository when files have not been updated ?
Posted by Francois Beausoleil <fb...@users.sourceforge.net>.
On 16 Jul 2003 12:36:54 -0500, "Ben Collins-Sussman" <su...@collab.net>
said:
> "Francois Beausoleil" <fb...@users.sourceforge.net> writes:
>
> > D:\wc>svn merge http://.../branches/A@7 http://.../branches/A@8
> > C compta.lib
> > C COMPTA.APP
> > C compta.exe
> >
> > Why are these files in conflict ? Last time they were updated was in
> > trunk/, at rev 1. They were not modified in between. There's probably
> > something I do not understand about branching and merging here...
>
> This is issue #1319.
>
Ooops, sorry. Why didn't go search beforehand...
Bye !
François
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
Re: svn merge says I have conflicts in repository when files have not been updated ?
Posted by Ben Collins-Sussman <su...@collab.net>.
"Francois Beausoleil" <fb...@users.sourceforge.net> writes:
> D:\wc>svn merge http://.../branches/A@7 http://.../branches/A@8
> C compta.lib
> C COMPTA.APP
> C compta.exe
>
> Why are these files in conflict ? Last time they were updated was in
> trunk/, at rev 1. They were not modified in between. There's probably
> something I do not understand about branching and merging here...
This is issue #1319.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org