[Adium-devl] Version control

[Alan Humpherys]

Having used both svn and mtn, I find svn to be more intuitive and  
would like    to recommend that we stick with svn.

Just my 2 cents

-- Alan Humpherys
__________
Sent from my iPhone

On Oct 8, 2007, at 9:51 PM, Augie Fackler <lists at durin42.com> wrote:

>
> On Oct 8, 2007, at 11:43 PM, Colin Barrett wrote:
>
>> On Oct 8, 2007, at 8:27 PM, Augie Fackler wrote:
>>
>>> If you're using DVCS, you don't want to rebase:
>>> http://changelog.complete.org/posts/586-Rebase-Considered-
>>> Harmful.html
>>> Executive summary: you change the history, which *really* hurts
>>> people pulling from your repository.
>>
>> You misunderstand.
>>
>> By "rebase" I mean make branch foo contain all of the changes in
>> branch bar, but *not* be branch bar. In a diagram of a DAG, it
>> would look like
>>
>> start
>>   o
>> /     \
>> o     o
>> |       |
>> o    /o <= 3
>> |   /   |
>> o/    o
>> |       |
>> a     b
>>
>> Warning, probably will look awful in a monospaced font.
>>
>> Do you see what I mean? I want to do a repeated merge from trunk
>> into my feature branch, so I can integrate new patches to that file
>> as they come in -- some of them are fixes I wrote on other branches
>> to solve problems (I pushed them upstream and am getting them
>> coming in from there), some of them are unrelated changes I want to
>> merge in before pushing upstream.
>>
>> As far as I can tell, hg does not handle this well. This hurts hard
>> when you have a branch that you leave alone but want to come back
>> to, and this is happening multiple times in one repository.
>
> Aha, ok. This isn't rebasing - this is just vanilla merging. Yeah, if
> you do it this way, hg does kind of suck - subversion is better for
> this particular workflow if you don't want to keep multiple
> repositories. Their best practice is to maintain a separate
> repository to work on a given branch. At least, that's my
> understanding as it stands now.
>
> I think git is better for this particular workflow - someone more
> knowledgeable about git will have to let you know. Note that with git-
> svn I think you could get this kind of functionality with our
> existing setup.
>
> Augie
>
>
>>
>> -Colin
>
>
> _______________________________________________
> Adium-devl mailing list
> Adium-devl at adiumx.com
> http://adiumx.com/mailman/listinfo/adium-devl_adiumx.com
>