[darcs-users] Re: why is darcs getting the "root" version of a file

[Terrence Brannon]

Jamie Webb <j at jmawebb.cjb.net> writes:

> On Thu, Jul 28, 2005 at 10:07:26AM +0000, Terrence Brannon wrote:
>> 
>> I dont understand why dacs would say it is applying the latest patches
>> but when you look at a file, its contents are only the initial add,
>> not all the patches to the file as well. The transcript follows. When
>> I cat the file, note how its contents are the initially added
>> contents, not the latest version of the file.
>
> The repo contains unresolved conflicts. Do a 'darcs resolve' to mark
> them.

server or client-side? should there have been some warning when doing
the pull advising what you said?

> >
> -- Jamie Webb

-- 
	Carter's Compass: I know I'm on the right track when,
	   by deleting something, I'm adding functionality.