Welcome Guest.   Make a donation to an author on the site April 18, 2014, 06:19:15 PM  *

Please login or register.
Or did you miss your validation email?


Login with username and password (forgot your password?)
Why not become a lifetime supporting member of the site with a one-time donation of any amount? Your donation entitles you to a ton of additional benefits, including access to exclusive discounts and downloads, the ability to enter monthly free software drawings, and a single non-expiring license key for all of our programs.


You must sign up here before you can post and access some areas of the site. Registration is totally free and confidential.
 
Check out and download the GOE 2007 Freeware Challenge productivity tools.
   
   Forum Home   Thread Marks Chat! Downloads Search Login Register  
Pages: [1]   Go Down
  Reply  |  New Topic  |  Print  
Author Topic: It's Time to Fix Subversion Merge  (Read 2173 times)
justice
Supporting Member
**
Posts: 1,885



Solve issues simply.

View Profile WWW Give some DonationCredits to this forum member
« 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
Logged

kyrathaba
N.A.N.Y. Organizer
Honorary Member
**
Posts: 2,975



while(! dead_horse){beat}

see users location on a map View Profile WWW Read user's biography. Give some DonationCredits to this forum member
« Reply #1 on: July 28, 2011, 06:09:03 PM »

Hurray!
Logged

Win 7 Home Premium 64bit-SP1 AMD Athlon II X2 220 Socket AM3 (938) @ 2.1GHz 6GB RAM Firefox 26.0
_________________________________________________________________________________________

I'm fighting against patent trolls. Join me and tell your representative to support the #SHIELDAct: https://eff.org/r.b6JJ /via @EFF

My DC page: http://kyrathaba.dcmembers.com | My blog: http://williambryanmiller.com/ | Proofreading Service: http://bit.ly/1fQSqQP

mwb1100
Supporting Member
**
Posts: 1,227


View Profile Give some DonationCredits to this forum member
« 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.org/..._subversion_to_wandisco_1).
« Last Edit: July 29, 2011, 12:37:27 AM by mwb1100 » Logged
Deozaan
Charter Member
***
Posts: 6,087



see users location on a map View Profile WWW Read user's biography. Give some DonationCredits to this forum member
« 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. Wink
Logged

kyrathaba
N.A.N.Y. Organizer
Honorary Member
**
Posts: 2,975



while(! dead_horse){beat}

see users location on a map View Profile WWW Read user's biography. Give some DonationCredits to this forum member
« 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.
Logged

Win 7 Home Premium 64bit-SP1 AMD Athlon II X2 220 Socket AM3 (938) @ 2.1GHz 6GB RAM Firefox 26.0
_________________________________________________________________________________________

I'm fighting against patent trolls. Join me and tell your representative to support the #SHIELDAct: https://eff.org/r.b6JJ /via @EFF

My DC page: http://kyrathaba.dcmembers.com | My blog: http://williambryanmiller.com/ | Proofreading Service: http://bit.ly/1fQSqQP

f0dder
Charter Honorary Member
***
Posts: 8,774



[Well, THAT escalated quickly!]

see users location on a map View Profile WWW Read user's biography. Give some DonationCredits to this forum member
« 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. Wink
No no, what they're doing now is the duct-tape-fixing version smiley
Logged

- carpe noctem
Shades
Member
**
Posts: 1,545


see users location on a map View Profile Give some DonationCredits to this forum member
« Reply #6 on: July 31, 2011, 10:32:09 AM »

SVN 'MacGuyver' edition?
Logged
kyrathaba
N.A.N.Y. Organizer
Honorary Member
**
Posts: 2,975



while(! dead_horse){beat}

see users location on a map View Profile WWW Read user's biography. Give some DonationCredits to this forum member
« 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?
Logged

Win 7 Home Premium 64bit-SP1 AMD Athlon II X2 220 Socket AM3 (938) @ 2.1GHz 6GB RAM Firefox 26.0
_________________________________________________________________________________________

I'm fighting against patent trolls. Join me and tell your representative to support the #SHIELDAct: https://eff.org/r.b6JJ /via @EFF

My DC page: http://kyrathaba.dcmembers.com | My blog: http://williambryanmiller.com/ | Proofreading Service: http://bit.ly/1fQSqQP

Pages: [1]   Go Up
  Reply  |  New Topic  |  Print  
 
Jump to:  
   Forum Home   Thread Marks Chat! Downloads Search Login Register  

DonationCoder.com | About Us
DonationCoder.com Forum | Powered by SMF
[ Page time: 0.043s | Server load: 0 ]