Click here to Skip to main content
15,897,891 members
Home / Discussions / C#
   

C#

 
AnswerRe: the form stops Pin
Luc Pattyn20-Sep-07 13:05
sitebuilderLuc Pattyn20-Sep-07 13:05 
QuestionMultiTabbed WebBrowser (unique Instances) Pin
Beef Feeter20-Sep-07 12:29
Beef Feeter20-Sep-07 12:29 
AnswerRe: MultiTabbed WebBrowser (unique Instances) Pin
Scott Dorman20-Sep-07 19:20
professionalScott Dorman20-Sep-07 19:20 
GeneralRe: MultiTabbed WebBrowser (unique Instances) Pin
Beef Feeter20-Sep-07 22:26
Beef Feeter20-Sep-07 22:26 
GeneralRe: MultiTabbed WebBrowser (unique Instances) Pin
Scott Dorman21-Sep-07 4:11
professionalScott Dorman21-Sep-07 4:11 
Questionc# Images into Video file [modified] Pin
BenGriffiths20-Sep-07 11:59
BenGriffiths20-Sep-07 11:59 
AnswerRe: c# Images into Video file Pin
Christian Graus20-Sep-07 14:26
protectorChristian Graus20-Sep-07 14:26 
QuestionCVS with big C# Winforms project Pin
jesarg20-Sep-07 11:44
jesarg20-Sep-07 11:44 
I'm using CVS with a very large WinForms project (written in C#).

A little over a month ago, the code split into 2 lines (6.0 and 5.1). Over the past month, I've been making changes in over 100 files for various enhancements and bug fixes in 5.1, while other developers have been pushing unrelated changes into 6.0.

Now I need to push all my changes into the 6.0 line without overwriting the changes of other developers. There's probably only 2 or 3 files with unresolvable differences, and I'd hate to have to manually analyze over 100 diff's when the vast majority of the difference between files is that I made a change in a file that no one else made a change to, and most of the files that we both made changes to can be merged without trouble.

If there was a way to make CVS believe that I checked out version 6.0 on 8/10/2007 (when it was born), and that now I'm pushing changes I've made since then into 6.0, and it should merge these changes with everyone else's, I would be in great shape.

However, although I can check out 6.0 from 8/10/2007 and overlay my changes, it won't merge them back in, as it says the files have a "sticky date" on them. Can I remove the sticky date in such a way that it will still try to merge with other developers' changes rather than overwrite them?
AnswerRe: CVS with big C# Winforms project Pin
Paul Conrad23-Sep-07 6:42
professionalPaul Conrad23-Sep-07 6:42 
QuestionMultiple files through context menu Pin
Johan Martensson20-Sep-07 10:40
Johan Martensson20-Sep-07 10:40 
QuestionDesign pattern framework Pin
Wes Aday20-Sep-07 10:29
professionalWes Aday20-Sep-07 10:29 
AnswerRe: Design pattern framework Pin
Pete O'Hanlon20-Sep-07 10:44
mvePete O'Hanlon20-Sep-07 10:44 
GeneralRe: Design pattern framework Pin
Wes Aday20-Sep-07 11:04
professionalWes Aday20-Sep-07 11:04 
GeneralRe: Design pattern framework Pin
Pete O'Hanlon20-Sep-07 11:18
mvePete O'Hanlon20-Sep-07 11:18 
Questioneasy newbie question - SOLVED [modified] Pin
shwaguy20-Sep-07 10:27
shwaguy20-Sep-07 10:27 
AnswerRe: easy newbie question Pin
lost in transition 20-Sep-07 10:31
lost in transition 20-Sep-07 10:31 
GeneralRe: easy newbie question Pin
Scott Dorman20-Sep-07 10:38
professionalScott Dorman20-Sep-07 10:38 
GeneralRe: easy newbie question Pin
lost in transition 20-Sep-07 10:47
lost in transition 20-Sep-07 10:47 
GeneralRe: easy newbie question Pin
Scott Dorman20-Sep-07 10:51
professionalScott Dorman20-Sep-07 10:51 
AnswerRe: easy newbie question Pin
Scott Dorman20-Sep-07 10:36
professionalScott Dorman20-Sep-07 10:36 
GeneralRe: easy newbie question Pin
Pete O'Hanlon20-Sep-07 11:26
mvePete O'Hanlon20-Sep-07 11:26 
GeneralRe: easy newbie question Pin
Scott Dorman20-Sep-07 11:32
professionalScott Dorman20-Sep-07 11:32 
AnswerRe: easy newbie question Pin
shwaguy20-Sep-07 12:06
shwaguy20-Sep-07 12:06 
QuestionGridView Row updating Pin
ss.mmm20-Sep-07 9:57
ss.mmm20-Sep-07 9:57 
QuestionPerformanceCounter problems Pin
JMichael246820-Sep-07 8:53
JMichael246820-Sep-07 8:53 

General General    News News    Suggestion Suggestion    Question Question    Bug Bug    Answer Answer    Joke Joke    Praise Praise    Rant Rant    Admin Admin   

Use Ctrl+Left/Right to switch messages, Ctrl+Up/Down to switch threads, Ctrl+Shift+Left/Right to switch pages.