tortoisesvn - Why did my tortoise svn merge a file and not conflict it? -

-

i changed file locally , updated repository , else had updated file. instead of conflict coming , me having go in , diff file , select portions file use looks tortoise svn merged file instead...

merge http://img850.imageshack.us/img850/9733/merged.jpg

that means went well. conflict when versioning tool (svn) can't merge 2 versions of file properly.


Comments

Post a Comment

Popular posts from this blog

haskell - Using filter on an item in a list? -

-
i trying filter item in list , print them line line. here's code: data car = car string [string] int [string] testdatabase :: [car] testdatabase = [car"casino royale" ["daniel craig"] 2006 ["garry", "dave", "zoe", "kevin", "emma"],car"blade runner" ["harrison ford", "rutger hauer"] 1982 ["dave", "zoe", "amy", "bill", "ian", "kevin", "emma", "sam", "megan"]] formatcarrow (car b c d) = show ++ " | " ++ concat [i ++ ", " | <- init b] ++ last b ++ " | " ++ show c ++ " | " ++ concat [j ++ ", " | j <- init d] ++ last d displayfilmsbyyear :: string -> io [()] displayfilmsbyyear chosenyear = mapm (putstrln.formatfilmrow) [putstrln(filter ((== chosenyear).y)) | (w x y z) <- testdatabase] -- code not working think why isnt work...
Read more

c# - When does PreApplicationStartMethod actually get triggered to run? -

-
when using webactivator preapplicationstart method, triggers methods bound run? when iis7 has started app pool? when first request made webserver? else? if have answer, please provide reference got information? does of change in iis 7.5? webactivator preapplicationstart relies on asp.net preapplicationstartmethodattribute (see this link see how web activator works). preapplicationstartmethodattribute works when asp.net runtime starts up application , code runs in pipeline before app_start event gets fired. answer question, trigger happen when first request made web server (which in turn kicks in application start up). note trigger related asp.net app start , not app pool. app pool might running because of other application (can non asp.net app) when first request comes asp.net app, trigger happen (for particular app) because application gets started. if using auto-start feature iis re-start application on app pool recycle , preapplicationstart triggered. ...
Read more

tomcat6 - Exception when stopping container for a with Spring + Quartz + Tomcat web application -

-
when stopping tomcat, getting following exception: ...appears have started thread named [ org.springframework.scheduling.quartz.schedulerfactorybean#0_worker-10 ] has failed stop it. create memory leak. how can prevent it? have destroy-method set destroy on schedulerfactorybean bean. just say... we have exactely same error grails (wich spring -based) & quartz on tomcat server... thread can't stopped quartz pool we've never managed correct that
Read more