From: Joseph M. Newcomer on
Yes, and thirty years ago, I trained a secretary with no programming experience to handle
this kind of conflict (two of us had extensively modified dozens of files concurrently,
and she had to merge our changes and every once in a while there was a conflict. For the
several hundred changes she merged, I had to review six that were beyond what she thought
she could handle, and I didn't spend a half-hour performing the final merge)

I'm not sure why something this simple is treated as a killer problem.

XCode clearly has deep emotional problems if it complicates the simple task of adding a
new file to a project. It is really hard to imagine an intelligent human being creating a
system that made it impossible to have two independent programmers add new files to a
checked-out project in the same cycle. It is clearly out of touch with any form of
reality the rest of us have lived in with source management systems in the last 30 years.
But I've found far too many products created by people who had no concept of the needs of
the end users. Office 2007, and VS > 6 and < 2010 are prime examples.
joe

On Wed, 23 Jun 2010 23:37:48 -0700, "Mihai N." <nmihai_year_2000(a)yahoo.com> wrote:

>
>> But how can you have conflicts with a newly added file?
>> There's no old file to compare with!
>
>Diff tools are not aware of the file structure.
>
>So if the original project was this:
>
> fileSourc1.cpp
> fileSourc2.cpp
>
>I edited and added this:
>
> fileSourc1.cpp
> MihaiSource.cpp
> fileSourc2.cpp
>
>And you edited and added this:
>
> fileSourc1.cpp
> DavidSource.cpp
> fileSourc2.cpp
>
>For the diff program line 2 looks like a conflict.
>
>Now, this is the simplified version, you take a look
>and you can instantly see what happenend.
>The XCode projects are not that clean.
Joseph M. Newcomer [MVP]
email: newcomer(a)flounder.com
Web: http://www.flounder.com
MVP Tips: http://www.flounder.com/mvp_tips.htm
From: Joseph M. Newcomer on
See below...
On Thu, 24 Jun 2010 05:56:46 -0700, "David Ching" <dc(a)remove-this.dcsoft.com> wrote:

>
>"Mihai N." <nmihai_year_2000(a)yahoo.com> wrote in message
>news:Xns9DA0F062AA10EMihaiN(a)207.46.248.16...
>> So if the original project was this:
>>
>> fileSourc1.cpp
>> fileSourc2.cpp
>>
>> I edited and added this:
>>
>> fileSourc1.cpp
>> MihaiSource.cpp
>> fileSourc2.cpp
>>
>> And you edited and added this:
>>
>> fileSourc1.cpp
>> DavidSource.cpp
>> fileSourc2.cpp
>>
>> For the diff program line 2 looks like a conflict.
>>
>> Now, this is the simplified version, you take a look
>> and you can instantly see what happenend.
>> The XCode projects are not that clean.
>>
>
>I see, thanks. Kind of like two people adding two new dialogs to the .rc
>file in the same place. Thankfully, most merge tools will let you accept
>both people's changes pretty easily. IOW, creating
>
>fileSourc1.cpp
>fileSourc2.cpp
>MihaiSource.cpp
>DavidSource.cpp
>
>is a couple mouse clicks to merge.
>
****
If this mysterious XCode system makes it harder than the couple mouse clicks, it should be
characterized as deeply flawed in its fundamental design.
joe
****
>Thanks,
>David
Joseph M. Newcomer [MVP]
email: newcomer(a)flounder.com
Web: http://www.flounder.com
MVP Tips: http://www.flounder.com/mvp_tips.htm
From: Mihai N. on
> If this mysterious XCode system

This "mysterious XCode system" is the Apple IDE :-)


> should be
> characterized as deeply flawed in its fundamental design.

Yes, it is.



--
Mihai Nita [Microsoft MVP, Visual C++]
http://www.mihai-nita.net
------------------------------------------
Replace _year_ with _ to get the real email

From: Joseph M. Newcomer on
See below....
On Fri, 25 Jun 2010 02:33:15 -0700, "Mihai N." <nmihai_year_2000(a)yahoo.com> wrote:

>> If this mysterious XCode system
>
>This "mysterious XCode system" is the Apple IDE :-)
****
Oh. A tool from one of the most developer-hostile companies in the known universe!

[I was a Mac developer before I was a Windows developer, and the Mac tools were horrible.
In my talking with current Mac developers, none of them are particularly happy with
anything from Apple, and many of them have run screaming and do all their work in Eclipse
and, when possible, Java].
joe
****
>
>
>> should be
>> characterized as deeply flawed in its fundamental design.
>
>Yes, it is.
Joseph M. Newcomer [MVP]
email: newcomer(a)flounder.com
Web: http://www.flounder.com
MVP Tips: http://www.flounder.com/mvp_tips.htm
First  |  Prev  | 
Pages: 1 2 3 4 5 6 7 8 9
Prev: I love MFC!
Next: Using CMFCToolBar and CMFCMenuBar?