Re: Merge feature

2009-07-01 Thread Gommit

I have 3 mac users switching from PC in the office and using Versions,
they are all crying for merge.
So I guess that makes +3

On May 7, 4:15 pm, jcdesrochers jcdesroch...@gmail.com wrote:
 Just a quick question about Versions development road map do you
 plan in a near future to add merge support??? If so... any ETA??

 I'm evaluating the svn clients for mac and the merge functionality is
 a must for us.

 Thanks for answering.

 Regards,
   J-C

--~--~-~--~~~---~--~~
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 
versions+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en
-~--~~~~--~~--~--~---



Re: Merge feature

2009-06-29 Thread ericrdb

Yep, +1 here too.

I introduced SVN to our shop in the last month. With our staff still
grasping concepts, keeping all the interaction within one UI will
encourage us all to become Versions evangelists, not to mention depend
all the more on your tool instead of searching for alternatives.

Cheers,

--
Eric DB
www.mydbsolution.com

On Jun 14, 5:44 pm, Robin Charlton charlton.ro...@gmail.com wrote:
 +1 for me.
 Having recently moved from Perforce to SVN I'm a little surprised how poorly
 supported merging is (in general). In the past we'd create branches for any
 non-trivial development task and integrate back into the trunk only after
 acceptance testing.

 Whilst Perforce's clients are certainly no shining example of usability they
 do support a very capable merging GUI. Of course it is rather
 pricey in comparison. ;-)
 ~
 Robin | m...@robincharlton.me | twitter: robincharlton

 2009/6/14 echo goo...@echozone.com



  I bought and use Versions, and use Subcommander for svn merge + svn
  switch. I guess I'll add my +1 on the chance it might help to
  influence the developers, and add what I posted a year ago, expanding
  on Ray's suggestion to share how we use our tools..

  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.

  In Subcommander, merge is from a contextual menu of a revision (or
  span of revisions) from a log. switch is from a contextual menu from a
  browse repository view.

  On Jun 1, 7:30 am, Ray raimondi...@gmail.com wrote:
   I've never used a tool other than command line svn and a text editor to
   handle merges because all of my merging has been pretty simple.  However,
  I
   would probably become more adventurous with what I used merging for if I
  had
   a good tool to help me with it.
   To make this thread more helpful to the Versions team, would people be
   willing to outline what they like or don't like about the merge tools
  they
   currently use?  Then Versions may become even more of an obvious choice.

   -Ray

--~--~-~--~~~---~--~~
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 
versions+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en
-~--~~~~--~~--~--~---



Re: Merge feature

2009-06-14 Thread Robin Charlton
+1 for me.
Having recently moved from Perforce to SVN I'm a little surprised how poorly
supported merging is (in general). In the past we'd create branches for any
non-trivial development task and integrate back into the trunk only after
acceptance testing.

Whilst Perforce's clients are certainly no shining example of usability they
do support a very capable merging GUI. Of course it is rather
pricey in comparison. ;-)
~
Robin | m...@robincharlton.me | twitter: robincharlton


2009/6/14 echo goo...@echozone.com


 I bought and use Versions, and use Subcommander for svn merge + svn
 switch. I guess I'll add my +1 on the chance it might help to
 influence the developers, and add what I posted a year ago, expanding
 on Ray's suggestion to share how we use our tools..

 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.

 In Subcommander, merge is from a contextual menu of a revision (or
 span of revisions) from a log. switch is from a contextual menu from a
 browse repository view.

 On Jun 1, 7:30 am, Ray raimondi...@gmail.com wrote:
  I've never used a tool other than command line svn and a text editor to
  handle merges because all of my merging has been pretty simple.  However,
 I
  would probably become more adventurous with what I used merging for if I
 had
  a good tool to help me with it.
  To make this thread more helpful to the Versions team, would people be
  willing to outline what they like or don't like about the merge tools
 they
  currently use?  Then Versions may become even more of an obvious choice.
 
  -Ray
 


--~--~-~--~~~---~--~~
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 
versions+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en
-~--~~~~--~~--~--~---



Re: Merge feature

2009-06-03 Thread bids.bax...@googlemail.com

Another +1 from me. We're a cross-platform shop so I tend to use
TortoiseSVN on Windows to do merges, but a fast, integrated merge
window would make Versions much nicer to use.

On May 7, 5:15 pm, jcdesrochers jcdesroch...@gmail.com wrote:
 Just a quick question about Versions development road map do you
 plan in a near future to add merge support??? If so... any ETA??

 I'm evaluating the svn clients for mac and the merge functionality is
 a must for us.

 Thanks for answering.

 Regards,
   J-C

--~--~-~--~~~---~--~~
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 
versions+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en
-~--~~~~--~~--~--~---



Re: Merge feature

2009-06-03 Thread Quinn Taylor
Conflict resolution is a separate issue and feature from merge support  
— conflicts can occur even without branches or tags, and even with a  
single developer, so long as there are conflicting edits in multiple  
working copies.


Out of curiosity, do other clients offer conflict resolution? In my  
experience, there is no single quick fix for conflicts — each case is  
different and requires human interaction to figure out which changes  
to use. (SVN 1.5 added interactive conflict resolution, but there is  
no way to automatically guess the right thing to do.)


 - Quinn

On Jun 1, 2009, at 6:22 AM, iVira wrote:



+1. Version such a great svn client in all other cases. But lack of
conflicts resolving...
I have to avoid revert my changes, update and add them again. It's
such a headache

On May 7, 7:15 pm, jcdesrochers jcdesroch...@gmail.com wrote:

Just a quick question about Versions development road map do you
plan in a near future to addmergesupport??? If so... any ETA??

I'm evaluating the svn clients for mac and themergefunctionality is
a must for us.

Thanks for answering.

Regards,
  J-C


--~--~-~--~~~---~--~~
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 
versions+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en
-~--~~~~--~~--~--~---





smime.p7s
Description: S/MIME cryptographic signature


Re: Merge feature

2009-06-01 Thread Marchenko Igor

+1 here.

On May 7, 7:15 pm, jcdesrochers jcdesroch...@gmail.com wrote:
 Just a quick question about Versions development road map do you
 plan in a near future to add merge support??? If so... any ETA??

 I'm evaluating the svn clients for mac and the merge functionality is
 a must for us.

 Thanks for answering.

 Regards,
   J-C

--~--~-~--~~~---~--~~
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 
versions+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en
-~--~~~~--~~--~--~---



Re: Merge feature

2009-06-01 Thread iVira

+1. Version such a great svn client in all other cases. But lack of
conflicts resolving...
I have to avoid revert my changes, update and add them again. It's
such a headache

On May 7, 7:15 pm, jcdesrochers jcdesroch...@gmail.com wrote:
 Just a quick question about Versions development road map do you
 plan in a near future to addmergesupport??? If so... any ETA??

 I'm evaluating the svn clients for mac and themergefunctionality is
 a must for us.

 Thanks for answering.

 Regards,
   J-C

--~--~-~--~~~---~--~~
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 
versions+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en
-~--~~~~--~~--~--~---



Re: Merge feature

2009-06-01 Thread Ray
I've never used a tool other than command line svn and a text editor to
handle merges because all of my merging has been pretty simple.  However, I
would probably become more adventurous with what I used merging for if I had
a good tool to help me with it.
To make this thread more helpful to the Versions team, would people be
willing to outline what they like or don't like about the merge tools they
currently use?  Then Versions may become even more of an obvious choice.

-Ray

--~--~-~--~~~---~--~~
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 
versions+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en
-~--~~~~--~~--~--~---



Re: Merge feature

2009-05-30 Thread derekr

Isn't it merging when you hold alt and drag the dir/file into the dir
you want to merge with.

On May 29, 9:30 am, denisa de...@riverocktech.com wrote:
 Ditto on the +1 for a Merge feature.

 On May 28, 11:57 pm, drzax elvery@gmail.com wrote:



  Yet another +1. Please. I was so excited about Versions until I
  discovered this was missing. svn switch too.

  On May 26, 4:32 am, rwgrier rwgr...@gmail.com wrote:

   +1 here. I currently have to fire up another SVN tool (which isn't as
   nice) to do merges. Please add merging.

   On May 7, 12:15 pm, jcdesrochers jcdesroch...@gmail.com wrote:

Just a quick question about Versions development road map do you
plan in a near future to add merge support??? If so... any ETA??

I'm evaluating the svn clients for mac and the merge functionality is
a must for us.

Thanks for answering.

Regards,
  J-C
--~--~-~--~~~---~--~~
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 
versions+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en
-~--~~~~--~~--~--~---



Re: Merge feature

2009-05-29 Thread drzax

Yet another +1. Please. I was so excited about Versions until I
discovered this was missing. svn switch too.


On May 26, 4:32 am, rwgrier rwgr...@gmail.com wrote:
 +1 here. I currently have to fire up another SVN tool (which isn't as
 nice) to do merges. Please add merging.

 On May 7, 12:15 pm, jcdesrochers jcdesroch...@gmail.com wrote:

  Just a quick question about Versions development road map do you
  plan in a near future to add merge support??? If so... any ETA??

  I'm evaluating the svn clients for mac and the merge functionality is
  a must for us.

  Thanks for answering.

  Regards,
    J-C

--~--~-~--~~~---~--~~
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 
versions+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en
-~--~~~~--~~--~--~---



Re: Merge feature

2009-05-29 Thread denisa

Ditto on the +1 for a Merge feature.

On May 28, 11:57 pm, drzax elvery@gmail.com wrote:
 Yet another +1. Please. I was so excited about Versions until I
 discovered this was missing. svn switch too.

 On May 26, 4:32 am, rwgrier rwgr...@gmail.com wrote:

  +1 here. I currently have to fire up another SVN tool (which isn't as
  nice) to do merges. Please add merging.

  On May 7, 12:15 pm, jcdesrochers jcdesroch...@gmail.com wrote:

   Just a quick question about Versions development road map do you
   plan in a near future to add merge support??? If so... any ETA??

   I'm evaluating the svn clients for mac and the merge functionality is
   a must for us.

   Thanks for answering.

   Regards,
     J-C
--~--~-~--~~~---~--~~
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 
versions+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en
-~--~~~~--~~--~--~---



Re: Merge feature

2009-05-26 Thread rwgrier

+1 here. I currently have to fire up another SVN tool (which isn't as
nice) to do merges. Please add merging.

On May 7, 12:15 pm, jcdesrochers jcdesroch...@gmail.com wrote:
 Just a quick question about Versions development road map do you
 plan in a near future to add merge support??? If so... any ETA??

 I'm evaluating the svn clients for mac and the merge functionality is
 a must for us.

 Thanks for answering.

 Regards,
   J-C

--~--~-~--~~~---~--~~
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 
versions+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en
-~--~~~~--~~--~--~---