Re: Merge branches and trunk

[Phil Palmieri]

I use DiffMerge on OSX - its not anywhere near as polished..  and it
takes a few steps.

http://www.sourcegear.com/diffmerge/screenshots.html

Make sure you have both trunk/branch(s) you want to merge, open
diffmerge, pick your source/target directories.   then it will show
you all the differences, and you can manually make the merges, then re-
checkin.

Its not fancy, and not without effort - but until merging is in
versions app, this works for me.

Phil

On Dec 2, 5:48 pm, Joe Wicentowski  wrote:
> +1 on "merge" support, as well as a related feature, "cherrypick"
>
>
>
> On Wed, Dec 2, 2009 at 3:38 PM, mun  wrote:
> > workflow is entirely different but definitely +1 on "merge" support.
> > .m
>
> > On Dec 1, 1:54 pm, Zanfe  wrote:
> >> Hi all,
> >> I'd explain my doubts.
>
> >> I usually have the stable version of my site in the trunk and I work,
> >> for the updates, in a branch.
> >> When I complete my updates I would put my branch version in the trunk,
> >> but if I drag my files and directory on the trunk, Versions doesn't
> >> overwrite the directories and so I can't overwrite the trunk.
> >> So I try to export the branch version and put the exported files and
> >> directories in the trunk but Versions doesn't like this operation and
> >> doesn't permitt me to commit.
>
> >> The only way to be able to put my branch version in the trunk and to
> >> commit it is to delete, form Versions, the trunck files, to commit, to
> >> put exported branch files in the trunk, to add files and directories
> >> and at last to commit the new trunk.
>
> >> Is it the only way to "merge" branch version with trunk version?
> >> Is not possible, in some way, drag branch files and directories on the
> >> trunk without problems?
>
> >> Thanks a lot
> >> Bye
> >> Z
>
> > --
>
> > You received this message because you are subscribed to the Google Groups 
> > "Versions" group.
> > To post to this group, send email to versi...@googlegroups.com.
> > To unsubscribe from this group, send email to 
> > versions+unsubscr...@googlegroups.com.
> > For more options, visit this group 
> > athttp://groups.google.com/group/versions?hl=en.

--

You received this message because you are subscribed to the Google Groups 
"Versions" group.
To post to this group, send email to versi...@googlegroups.com.
To unsubscribe from this group, send email to 
versions+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en.

Re: Unfuddle Repository

[Phil Palmieri]

HI,

I use versions with unfuddle all the time,

when you go to create a new repo bookmark take these steps:

1) Enter the name "Your Repo"
2) Enter the path: http://you.unfuddle.com/svn/you_reponame
3) Enter your login you_yourname
4) Password yourpassword
5) Save the bookmark.

If you don't put your user/pass AFTER enterign the url versions doesnt
auto-append it and it wont work.

Phil


On Nov 14, 8:56 pm, bikuta <[EMAIL PROTECTED]> wrote:
> I'm trying to connect to my Unfuddle repositories but I keep getting
> this error:
> OPTIONS of 'http://###.unfuddle.com/svn/###_###': could not connect to
> server (http://###.unfuddle.com)
>
> Note: I've replace the actual names with ### for privacy reasons.
>
> I know I can connect to the repositories because I can browse the
> repository using my browser.
>
> I'm using Versions 1.0b9 (45)
> Anyone know why this is happening?
--~--~-~--~~~---~--~~
You received this message because you are subscribed to the Google Groups 
"Versions" group.
To post to this group, send email to versions@googlegroups.com
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
-~--~~~~--~~--~--~---