On 07.07.2010 18:29, Greg Hudson wrote: > On Wed, 2010-07-07 at 11:44 -0400, Marco Jansen wrote: > >> So therefor, what we would like to see is to be able to have a transparent >> branch: One which fetches updates from both branch and trunk, without having >> them listed as changes or triggering commits. In essence it's reading from >> two branches, where a last known revision of a file could be from either >> branch, and committing to one only when it has changes from this 'either' >> latest revision. >> > I'm not sure if this is a feature of any popular version control system. > What would happen if trunk changes didn't merge easily with the changes > on one or more transparent branches? >
ClearCase and AccuRev come to mind. AccuRev might not be that popular, but ClearCase definitely is. -- Brane