Merge in Revision Graph

Hi there,

I'm currently evaluating migration of a project from IBM ClearCase to
Subversion. There is one use-case that we often have, that is easily
solved in ClearCase but I'm not sure what the right way would be in SVN:

We often have this scenario:

* Announce a release at a special point in time

* Announce code freeze some time before it

* At that point in time, create tag; i.e. svn copy the trunk to
a tag dir

* Release from the tag

For a big project, it happens quite often that single developers forgot
to check files into the trunk or similar stuff. So the versioning role
guy has to also move those overdue changes into the tag after the tag
has been created.

In ClearCase this is very easy, because a tag is just some label at some
version of a single file (in CC versioning is based on single files and
not whole repository revisions). In a revision graph you can simply move
that label for each single file a little up or down in version history.

How would you do this in a convenient way in SVN? I understand you have
to merge the latest missing change of a file, e.g. from trunk into the
tagged version. A very convenient way would be to do this from the
revision graph, e.g. select the trunk version and the older tagged
version and call some "merge" menu entry from the context menu in the
revision graph. However, there is no "merge" menu entry for single
files, but only for whole directories ("Merge Revision to...")? Why? Any
alternative?

The "merge" wizard on files is not very intuitive from my point of view,
so merging in SVN is kind of pain and thus the versioning guys here are
arguing in favor for ClearCase in this matter.

Some other people also try to convince me that merging is pain in svn
and that we should better go to Git directly where merging and branching
is first-class citizen and very easy to use without the need to enter
long revision URLs and so on.

Is there any other svn support tool, where you can do more things in
some graphical view like the revision graph?

Cheers,

Hauke

-- 
========
Eurasia Rail, Istanbul/Turkey, 8-10ǀ03ǀ2012, Funkwerk: Hall 10, Stand C16
Computer Science and Transport Symposium Kiel, Kiel/Germany, 10ǀ05ǀ2012
========
Diese E-Mail kann vertrauliche und/oder rechtlich geschuetzte Informationen enthalten. Wenn Sie nicht der richtige Adressat sind oder diese E-Mail irrtuemlich erhalten haben, informieren Sie bitte sofort den Absender durch eine Antwortmail und vernichten Sie diese Mail. Das unerlaubte Kopieren sowie die unbefugte Weitergabe dieser Mail ist nicht gestattet. Wir danken fuer Ihre Kooperation.
This e-mail may contain confidential and/or privileged information. If you are not the intended recipient or have received this e-mail in error, you are on notice of its status. Please notify the sender immediately by reply e-mail and delete this e-mail from your systems. Any unauthorized copying, disclosure or distribution of the material in this e-mail is strictly prohibited. Thank you for your cooperation.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2931706
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].