[LLVMdev] git Status Update?
David A. Greene
greened at obbligato.org
Fri Sep 9 04:11:34 PDT 2011
Bill Wendling <wendling at apple.com> writes:
>>> It's my understanding that the upcoming new version of SVN will have
>>> off-line commits available.
>>
>> Frankly, that's the least important feature git has.
>>
> And yet it's the first one that people point out. :-)
It is? I think you may be confusing offline operation with private
branches. They are not the same.
Some quick searching reveals that one or two SVN developers may be
considering developing a distributed SVN. That would indeed be welcome
and would alleviate a lot of issues. Unfortunately I can't find
anything offficialish that indicates the idea is being persued. It also
looks to be two years away, at least, given some rather hand-wavey
predictions of when stuff could happen, if approved.
Admittedly, this was a very quick search. If you have pointers, that
would be very helpful.
>> Not true. SCM support means you get to use all sorts of nice merge
>> tools to handle the sync. Applying patches sucks.
>>
> I use "svn merge -c <rev#> ..." with great efficacy. And it has a nice
> way to resolve conflicts.
You use svn merge -c in a working directory merging from one branch to
another. Don't confuse an SVN working directory or an SVN branch with a
repository.
> The LLVM development style is to do as much on ToT as possible with
> little branching or mirroring needed. This seems to be at odds with
> your development style, which is that you keep a tree of your own with
> your changes there.
It's not "my" development style. Plenty of places do exactly this. How
else can an organization keep sane control over its source?
> So there is then conflict. I doubt that things are going to change any
> time soon.
Too bad.
-Dave
More information about the llvm-dev
mailing list