[darcs-devel] [darcs #454] Darcs makes a conflict for patches that do not conflict

via RT bugs at darcs.net
Wed Jul 6 03:48:14 PDT 2005


Wed Jul 06 06:48:13 2005: New ticket: 454.
Transaction: Ticket created by guest
       Queue: Darcs
     Subject: Darcs makes a conflict for patches that do not conflict
       Owner: Nobody
  Requestors: atehwa at sange.fi
      Status: new
 Ticket <URL: http://bugs.darcs.net/.//Ticket/Display.html?id=454 >


This is reproducible in Darcs 1.0.2:

1. create a (n empty) repository, "repo"
2. create a branch from that, "repo-branch"
3. create a file "foo" in "repo" and rename it into "foo2", record
4. create a file "foo" in "repo-branch" and record
5. pull in changes from "repo" into "repo-branch"

Darcs reports conflicts. (This is bug 1: it probably should not, but it
should make "addfile foo" of "repo-branch" depend on "move foo foo2" of
"repo".)

Darcs does not give a way to obtain the previous version of "foo" in
"repo-branch".  (This is bug 2: it probably should dump the contents of
both files, with conflict markers, into the file created by "darcs
resolve".)

Version info:

$ darcs --exact-version
darcs compiled on Feb 12 2005, at 13:59:36
# configured Sat Feb 12 13:53:58 PST 2005
sh ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib
--mandir=/usr/share/man

Context:

[ removed obsolete NEWS files
Isaac Jones <ijones at syntaxpolice.org>**20050212211000]

[syncinc with my debian repo after 1.0.0 bug
Isaac Jones <ijones at syntaxpolice.org>**20050212205746]

[TAG 1.0.2
David Roundy <droundy at abridgegame.org>**20050204123805]







More information about the darcs-devel mailing list