On Windows, I use TortoiseSVN, wich has fantastic merge features. It automatically greys-out revisions that have already been merged, and seems to 'Just Work' with a minimum of input.
Just yesterday at work I was merging a branch back to trunk, and it's as simple as invoking merge, selecting the branch, and clicking 'Merge' (after using dry-run first ;)). Now I come to today and I'm trying to do a similar task on a different project, and having to use the command-line tool is *painful*. I'm tempted to boot up my WinXP VM just to do the merge! On Oct 22, 10:47 pm, Shan <[EMAIL PROTECTED]> wrote: > Sorry I wasn't clear... What I was talking about was having Versions > suggest the revision numbers by searching the logs, not automatically > doing merge tracking. Perhaps when you do a branch or merge, it could > add some text to the comment for easy log scanning, thus giving hints > to the users and the UI. > > I've got to get rid of this cold. I'm barely clear to myself, who > knows how I sound to you guys :) --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/versions?hl=en -~----------~----~----~----~------~----~------~--~---
