Hi Erik,
On Sun, Jul 02, 2006 at 11:35:38AM +0200, Erik Huelsmann wrote:
> On 6/30/06, Jens Seidel <jensseidel@users.sf.net> wrote:
> >I merged a file multiple time where the first merge adds this file. I
> >noticed
> >that there is a conflict in this file which is not indicated by svn status:
> >
> >Is there a valid status flag for this situation at all?
> >I expected "C + " or something similar.
> >
> >Is this problem already known?
>
> No, this problem is new. If you could create a reproduction recipe I
> would be most gratefull!
OK, it was not very difficult to reproduce it. I also noticed that subversion
is really aware of this conflict, it's just not possible to display it in the
svn status output.
$ cd /tmp
$ svnadmin create repos
$ svn mkdir -m"created branch/" file:///tmp/repos/branch
Committed revision 1.
$ svn mkdir -m"created trunk/" file:///tmp/repos/trunk
Committed revision 2.
$ svn co file://$(pwd)/repos wc
A wc/trunk
A wc/branch
Checked out revision 2.
$ cd wc/branch/
$ echo "line 1
> line 2
> line 3" > file
$ svn add file
A file
$ svn ci -m"Added file" file
Adding file
Transmitting file data .
Committed revision 3.
$ echo "line 1
> line 3" > file
$ svn ci -m"Removed line 2" file
Sending file
Transmitting file data .
Committed revision 4.
$ echo "line 1
> line 2" > file
$ svn ci -m"Fixed line numbering" file
Sending file
Transmitting file data .
Committed revision 5.
# Now let's create the conflict
$ cd ../trunk/
$ svn merge -r 2:3 file:///tmp/repos/branch
A file
$ svn merge -r 4:5 file:///tmp/repos/branch
C file
It's easy to not notice this typo once you merge large subtrees.
$ svn status
? file.merge-left.r4
? file.merge-right.r5
? file.working
A + file
$ cat file
line 1
<<<<<<< .working
line 2
line 3
=======
line 2
>>>>>>> .merge-right.r5
$ svn ci -m"file with conflict" file
svn: Commit failed (details follow):
svn: Aborting commit: '/tmp/wc/trunk/file' remains in conflict
Again: Please CC: me.
Jens
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jul 3 16:32:07 2006