[darcs-users] Re: fixing conflicts in darcs

Erik Bågfors zindar at gmail.com
Mon Nov 29 12:41:45 UTC 2004


On 29 Nov 2004 13:13:38 +0100, Samuel Tardieu <sam at rfc1149.net> wrote:
> >>>>> "Erik" == Erik Bågfors <zindar at gmail.com> writes:
> 
> Erik> Just to make it real clear, here's an example. I do patch A, B,
> Erik> C and D.  Then I pull a new version of the remote repo, I then
> Erik> get a conflict in patch B (btw, how do I know it's in B?) and I
> Erik> have to create a new patch, E to solve B's conflict.  I'd like
> Erik> to modify B instead.
> 
> If your repository has not been pulled from by others, unpull D then
> amend B, then pull D again.
> 

I just tried this and it didn't work for me.
I tried to create A, B and C in one repo, then D in the other.  D will
conflict with C in this case.

Then I pulled D and it conflicted with C, then I couldn't unpull D.

Here is the output.

: [bagfors at zyrgelkwytng]$ ; vi passwd

#[Mon Nov 29 13:37:39]:~/src/darcs-test/darcs-repros/darcs-repro-co/etc
: [bagfors at zyrgelkwytng]$ ; darcs record -am A
Finished recording patch 'A'

#[Mon Nov 29 13:37:44]:~/src/darcs-test/darcs-repros/darcs-repro-co/etc
: [bagfors at zyrgelkwytng]$ ; vi passwd

#[Mon Nov 29 13:37:53]:~/src/darcs-test/darcs-repros/darcs-repro-co/etc
: [bagfors at zyrgelkwytng]$ ; darcs record -am B
Finished recording patch 'B'

#[Mon Nov 29 13:37:56]:~/src/darcs-test/darcs-repros/darcs-repro-co/etc
: [bagfors at zyrgelkwytng]$ ; vi passwd

#[Mon Nov 29 13:38:11]:~/src/darcs-test/darcs-repros/darcs-repro-co/etc
: [bagfors at zyrgelkwytng]$ ; darcs record -am C
Finished recording patch 'C'

#[Mon Nov 29 13:38:14]:~/src/darcs-test/darcs-repros/darcs-repro-co/etc
: [bagfors at zyrgelkwytng]$ ; darcs pull
Pulling from /home/bagfors/src/darcs-test/darcs-repros/darcs-repro/etc...

Mon Nov 29 13:37:33 CET 2004  erik at bagfors.nu
  * D
Shall I pull this patch? (1/1) [ynWvxqadjk], or ? for help: y
We have conflicts in the following files:
./passwd
Finished pulling.

#[Mon Nov 29 13:38:19]:~/src/darcs-test/darcs-repros/darcs-repro-co/etc
: [bagfors at zyrgelkwytng]$ ; darcs unpull

Mon Nov 29 13:37:33 CET 2004  erik at bagfors.nu
  * D
Shall I unpull this patch? [yNvq?] y

darcs failed:  Couldn't commute patch past pending.
[Exit 2 ]


I'm using darcs from darcs btw, compiled yesterday.

Regards,
Erik




More information about the darcs-users mailing list