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

Merging an altered and renamed file

From: Matthew <MaTriCX_at_gmail.com>
Date: 2005-12-05 11:53:56 CET

Goodday tortoise users,

I have been using Tortoise quite some time now, and recently for larger projects
( >35 people ). The tool is magnificant and very user-friendly, but I think I
have stumbled upon a bug (or it's just me doing something wrong).

What did I do:
I was trying to merge a branch with my working copy ( trunk ).
Branch :
- Edited one file (file1.txt) and renamed it to file2.txt in 1 commit
WC :
- Edited the same file (file1.txt), different text of course and even a
different location of edit.

What happened:
When merging these two, it simply adds file2.txt to the result, but neglects the
changes made in my current working copy. Because the rename and changes were
done in 1 commit, I cannot merge just the change.

What I Expected:
- The changes in file1.txt were first checked against eachother and in case of a
conflict, conflicthanding (as normal) is expected. And then the result should
have been file2.txt.

I hope you understand my description of the problem and hopefully you can help
me out with this.

Thank you for your time and keep up the good work.



Latest stable-releases of both tortoiseSVN and subversion.

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Dec 5 12:40:09 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.