RE: Using temporary branches and mergeinfo properties

Sorry that I didn't replied for a while. I didn't noticed there were any replies on my message.

Ok, I'll try to explain it a bit more:
- All developers work on the trunk.
- After all features are in we have a feature stop and branch the whole trunk.
- Most developers will now continue to work on the trunk and add new features for future releases.
- We do some small bug fixing on the branch and when everything is working as it should, we tag the brach and release the product.

Till here everything is working as expected.

- Now we need to merge the fixed bugs from the branch back to the trunk. (so we just merge revisions back to the trunk. Not the whole branch)

This will cause all kind of mergeinfo properties on unchanged files.

We also sometimes work the other way around. We sometimes fix bugs on the trunk or add new features to the trunk that need to be merged to the branch (so we can release a service pack containig fixes/new feature based on the old version of the software). This will also cause a lot of empty mergeinfo properties for a lot of files.

Server: 1.6.5
Client: TurtoiseSVN 1.6.5, Subversion 1.6.5 (commandline tool)

It even goes wrong when I self create a branch, do some changes on that branch and merge those changes back to the trunk on the same computer (so no other/older version of SVN are used in between)

I noticed that it sometimes can help if I turn on the 'Ignore ancestry' checkbox when merging.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2424808

Please start new threads on the <users_at_subversion.apache.org> mailing list.
To subscribe to the new list, send an empty e-mail to <users-subscribe_at_subversion.apache.org>.
Received on 2009-11-27 10:42:56 CET