I have now tried a simple test.:
1. I committed one of the files from my merge to /trunk. It was one
of the files showing modified properties.
2. I then modified that same file in /branch with a new modifiction
and committed the change to branch.
3. I tried to merge that changed file to /trunk but it showed as a
conflict, which it should not, since the file in /trunk has not been
I am at a loss what to do. Our project is grinding to a halt as we
are unable to merge changes from branch to trunk. Our branch has many
changes in various states of development, some ready to merge to
trunk, some not., some which will 'break' areas of the project until
they are completed. Recommitting all these directly to /trunk or to a
new branch if we have to create one will be considerable work. But if
that is what we must do, now is better than later :).
Since I do not understand where the problem lies I am not sure what
solution will work.
What would you recommend to resolve this issue?
1. Create a new branch and recommit all changes
2. Do not use branch/merge in our project but commit all changes to /
3. Delete and recreate the entire Project repository
None of these are ideal, and I am not even convinced option 1 will
work. But we have to do something. If you need to look at the
repository, the link is http://code.google.com/p/amped/source/browse/
I realize it is not your job to fix our repository. I am only hoping
you can tell us why branching and merging is not working for us and
how we should do it so it does work.
The issue of the speed of the merge is now secondary and can be dealt
with later (unless is is connected). Our current problem is the
inability to merge from branch to /trunk successfully.
Thanks for any help you can provide. And I apologize for creating two
issues in one post. I should have started a separate one about our
merging problem separate from the speed issue.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-10 17:30:26 CEST