[darcs-users] Re: fixing conflicts in darcs

Christoph Wegscheider wegi at despammed.com
Tue Nov 30 06:36:21 UTC 2004


Erik Bågfors <zindar at gmail.com> wrote:
> In cvs, since it's centralized I simply don't checkin/submit until I
> don't have any conflicts.  but in darcs I do my records on my local
> repository and then when I'm about to push/send I get my conflicts,
> but then they appear in a already "submitted (recorded)" patch. To
> solve the conflics I've been doing a new "record" and then my
> send/push.  The   problem with this is that I get patches that create
> conflicts, then patches that only fixes conflicts.  I would prefer to
> change the conflicting patch instead.
> 
> Just to make it real clear, here's an example. I do patch A, B, C and
> D.  Then I pull a new version of the remote repo, I then get a
> conflict in patch B (btw, how do I know it's in B?) and I have to
> create a new patch, E to solve B's conflict.  I'd like to modify B
> instead.

Maybe you are looking for darcs amend-record, that's what I do in a
situation you described above. I'm also very new to darcs, so there might
be better ways to do that. 

Of course amend-record is only an option if the record to be modified is
local only (not pushed/sent yet). 


	Christoph





More information about the darcs-users mailing list