Our workflow uses developer branches, that we merge from a dev branch. We then switch our working copy to the dev branch, merge remote dev with second source of our branch (now remote), then merge that back to remote dev branch, then switch our wc back to our branch.
I use Subcommander http://subcommander.tigris.org/ (open source). It's stable and does what I want, although very un Mac like and quirky UI. I stick to v.1.3.0 even though they say beta2 is better, it definitely lacks essential functionality. In Subcommander, "merge" is from a contextual menu of a revision (or span of revisions) from a log. When the merge dialog is accessed from a log, the revsion #s are filled in to some extent. "switch" is from a contextual menu from a browse repository view. I *really* hope that Versions can replace this functionality. I'm disappointed the beta is moving closer to final with seemingly no new features lke merge being added. --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
