After your questions, I reexamined the merge operation once again and I
think you mentioned pointed causing the problems: All files with conflicts
raised have been commited into the branch with changes on them. Other files,
having about the same bit of changes applied to but without having changes
alreay when creating the branch, worked fine.
I attach 3 files and describe how to reproduce the problem:
- You have a repository test with directories trunk/src and branches
- Copy attached file uni_druck_gp12.c.r502 into trunk/src/uni_druck_gp12.c
and
commit it - this is the version before the branch is created
- Copy attached file uni_druck_gp12.c.r503 into trunk/src/uni_druck_gp12.c -
the file now contains the changes which have been made when the branch was
created
- Create the branch: svn copy src svn://server//test/branches/test-branch
- Checkout the branch and copy attached file uni_druck_gp12.c.r540 into
trunk/branches/test-branches/uni_druck_gp12.c - the file now contains the
changes made when the branch was active
- Commit the branch
- Now checkout a new trunk directory and execute the command
svn merge -r <revision-when-branch-was-created>:HEAD
svn://test/branches/test-branch
and the file uni_druck_gp12.c will have erroneously a status of conflict
What do you think?
Thomas
-----Ursprüngliche Nachricht-----
> Von: Dale Worley [mailto:dworley@pingtel.com]
> Gesendet: Dienstag, 14. Juni 2005 19:40
> 2) When you created the branch, was it just a copy from the trunk, or a
copy
> with changes? If there were changes, what exactly were they?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 17 15:18:37 2005