Home | Blog | Software | Reviews and Features | Forum | Help | Donate | About us
topbanner_forum
  *

avatar image

Welcome, Guest. Please login or register.
Did you miss your activation email?

Login with username, password and session length
  • September 28, 2016, 06:58:57 AM
  • Proudly celebrating 10 years online.
  • Donate now to become a lifetime supporting member of the site and get a non-expiring license key for all of our programs.
  • donate

Author Topic: It's Time to Fix Subversion Merge  (Read 2730 times)

justice

  • Supporting Member
  • Joined in 2006
  • **
  • Posts: 1,898
    • View Profile
    • Donate to Member
It's Time to Fix Subversion Merge
« on: July 28, 2011, 07:22:49 AM »

Quote
This month we launched a project to fix Subversion merge.  Subversion fills a need for simplicity and team synchronization.  It also has an advantage handling large files and repositories.  However, there is one thing about Subversion that definitely sucks:  Merging.

We've started work with the Apache Subversion team to fix the merge in a way that will be compatible with existing servers and clients.  Once this is released, we will be able to bring great modern workflows to Subversion, including contributor branching and merging, merge requests, code reviews, etc.  We'll future-proof your existing Subversion repository and accelerate your development.

from Assembla blog

kyrathaba

  • N.A.N.Y. Organizer
  • Honorary Member
  • Joined in 2006
  • **
  • Posts: 3,120
    • View Profile
    • Donate to Member
Re: It's Time to Fix Subversion Merge
« Reply #1 on: July 28, 2011, 06:09:03 PM »
Hurray!

mwb1100

  • Supporting Member
  • Joined in 2006
  • **
  • Posts: 1,515
    • View Profile
    • Donate to Member
Re: It's Time to Fix Subversion Merge
« Reply #2 on: July 29, 2011, 12:34:08 AM »
It took a long time for SVN merge tracking to get added, which was supposed to solve most merge problems.  See http://blog.red-bean.com/sussman/?p=92

I don't have much experience with it yet (my work's SVN repository just got upgraded to support it). It seems to help a lot, but still not be quite enough to make merges pain free.

I wonder how long this effort by Assembla will take (and I see that they're bringing in the WANdisco team to help - after some WANdisco blog entries about tackling this problem themselves caused a major backlash from the SVN community: https://blogs.apache...ersion_to_wandisco_1).
« Last Edit: July 29, 2011, 12:37:27 AM by mwb1100 »

Deozaan

  • Charter Member
  • Joined in 2006
  • ***
  • Points: 1
  • Posts: 7,647
    • View Profile
    • The Blog of Deozaan
    • Read more about this member.
    • Donate to Member
Re: It's Time to Fix Subversion Merge
« Reply #3 on: July 29, 2011, 07:34:57 PM »
Didn't they already fix it a while ago? But they called it something else...  Like Mercurial or Git or something. ;)


kyrathaba

  • N.A.N.Y. Organizer
  • Honorary Member
  • Joined in 2006
  • **
  • Posts: 3,120
    • View Profile
    • Donate to Member
Re: It's Time to Fix Subversion Merge
« Reply #4 on: July 30, 2011, 03:17:01 PM »
Quote
Didn't they already fix it a while ago? But they called it something else...  Like Mercurial or Git or something.

Heh!

Good one.

f0dder

  • Charter Honorary Member
  • Joined in 2005
  • ***
  • Posts: 9,027
  • [Well, THAT escalated quickly!]
    • View Profile
    • f0dder's place
    • Read more about this member.
    • Donate to Member
Re: It's Time to Fix Subversion Merge
« Reply #5 on: July 31, 2011, 09:53:48 AM »
Didn't they already fix it a while ago? But they called it something else...  Like Mercurial or Git or something. ;)
No no, what they're doing now is the duct-tape-fixing version :)
- carpe noctem

Shades

  • Member
  • Joined in 2006
  • **
  • Posts: 2,079
    • View Profile
    • Donate to Member
Re: It's Time to Fix Subversion Merge
« Reply #6 on: July 31, 2011, 10:32:09 AM »
SVN 'MacGuyver' edition?

kyrathaba

  • N.A.N.Y. Organizer
  • Honorary Member
  • Joined in 2006
  • **
  • Posts: 3,120
    • View Profile
    • Donate to Member
Re: It's Time to Fix Subversion Merge
« Reply #7 on: July 31, 2011, 02:27:22 PM »
Can (meaning "Is it possible?" not "May I?") I set up my DC ftp account to work with TortoiseSVN?