multiple language support: dialog-boxes
in [MFC]
|
Prev: I love MFC!
Next: Using CMFCToolBar and CMFCMenuBar?
From: David Ching on 23 Jun 2010 12:04 "Mihai N." <nmihai_year_2000(a)yahoo.com> wrote in message news:Xns9DA02721F77DMihaiN(a)207.46.248.16... >> whatever XCode is, it must be a horrible mechanism if you can't >> add files! > > You can add files, with point and click. > But if you want to submit to version control and have a conflict, then > you have to look inside. And that's scarry :-) > But how can you have conflicts with a newly added file? There's no old file to compare with! -- David
From: Joseph M. Newcomer on 23 Jun 2010 15:13 Of course there isn't. That's what is meant by "new file". joe On Wed, 23 Jun 2010 09:04:50 -0700, "David Ching" <dc(a)remove-this.dcsoft.com> wrote: >"Mihai N." <nmihai_year_2000(a)yahoo.com> wrote in message >news:Xns9DA02721F77DMihaiN(a)207.46.248.16... >>> whatever XCode is, it must be a horrible mechanism if you can't >>> add files! >> >> You can add files, with point and click. >> But if you want to submit to version control and have a conflict, then >> you have to look inside. And that's scarry :-) >> > >But how can you have conflicts with a newly added file? There's no old file >to compare with! > >-- 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: David Ching on 23 Jun 2010 15:38 So, why is there a conflict? -- David "Joseph M. Newcomer" <newcomer(a)flounder.com> wrote in message news:57n4269v39ckik4sqsijunfg3vjb4mv1lm(a)4ax.com... > Of course there isn't. That's what is meant by "new file". > joe > > On Wed, 23 Jun 2010 09:04:50 -0700, "David Ching" > <dc(a)remove-this.dcsoft.com> wrote: > >>"Mihai N." <nmihai_year_2000(a)yahoo.com> wrote in message >>news:Xns9DA02721F77DMihaiN(a)207.46.248.16... >>>> whatever XCode is, it must be a horrible mechanism if you can't >>>> add files! >>> >>> You can add files, with point and click. >>> But if you want to submit to version control and have a conflict, then >>> you have to look inside. And that's scarry :-) >>> >> >>But how can you have conflicts with a newly added file? There's no old >>file >>to compare with! >> >>-- 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 24 Jun 2010 02:37 > 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. -- Mihai Nita [Microsoft MVP, Visual C++] http://www.mihai-nita.net ------------------------------------------ Replace _year_ with _ to get the real email
From: David Ching on 24 Jun 2010 08:56
"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. Thanks, David |