Who here works on Subversion?

[John Abreau]

On Sun, 2 Oct 2005, Steven W. Orr wrote:

> I remember that there were one or two people here who were the sv 
> developers. Please write back to me. The idea is that there is a 
> deficiency in sv's merge capabilties and I was wondering if this is a 
> functional item that is intended to be fixed.
> 
> Here's the scenario:
> 
>                                    main
>                                     |
>                                     |
>                                     |
>                                    /|
>                                   / |
>                             dev  /  |
>                                 /   |
>                                /-->>|      [dev merges back to main]
>                               /     |    [but devel continues on both main
>                              /      |     and dev]
>                             /----->>|	[Proposed new merge back to main]
> 
> 
> Now that we want to do another merge from dev back to main, the merge tool 
> provides no help in knowing that a previous merge has already happened. 
> The result is that every affected file will have to be merged manually.
> 
> Is this something that sv is planning on supplying?

I'm not a subversion developer, I've just used it on a few small projects. 
But if I'm understanding correctly, at the point where you've completed 
that first merge, your dev branch and your main branch would be identical, 
right? 

If that's the case, then I would think your situation is functionally 
identical to merging dev into main and then starting a brand new dev fork. 
In other words, it's just as if you're working with a second development 
branch after the first merge, but you'd mistakenly reused the name of the 
first dev branch. 

-- 
John Abreau / Executive Director, Boston Linux & Unix
ICQ 28611923 / AIM abreauj / JABBER jabr at jabber.org / YAHOO abreauj
Email jabr at blu.org / WWW http://www.abreau.net / PGP-Key-ID 0xD5C7B5D9
PGP-Key-Fingerprint 72 FB 39 4F 3C 3B D6 5B E0 C8 5A 6E F1 2C BE 99