On Fri, Dec 10, 2010 at 01:09:45PM +0100, B Smith-Mannschott wrote: > On Thu, Dec 9, 2010 at 20:27, Kris Deugau <kdeu...@vianet.ca> wrote: > > Daniel Albuschat wrote: > >> > >> I'd like to create a branch from trunk and periodically merge trunk > >> into my branch to stay up to date with what happens in trunk. > >> At some point, the feature in my branch reaches a kind of stability > >> that is OK for trunk, so I merge it back to trunk. > >> The difference to the standard situation is that I want to continue > >> working on the branch, because the feature is not completely finished, > >> yet, or it needs further enhancement. > >> Currently the only solution I see is to reintegrate the branch to > >> trunk and then re-create the branch. This has the shortcoming that all > >> developers working on the branch have to switch to the new branch > >> (although it is the same URL) to be able to work with it, right? This > >> is ok when I'm working alone on my branch, but with a development > >> team, it becomes tricky to make sure that everyone properly switch to > >> the new branch. > > > > This is covered in the book: > > > > http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice > > Before going down that route, be sure to have understood the > implications of issue 3650: > http://subversion.tigris.org/issues/show_bug.cgi?id=3650 > > short summary: this technique renders `svn log --use-merge-history` useless.
It's worth pointing out that this is a bug in log --use-merge-history, not in the technique. Stefan