New submission from Panu Kalliokoski <[EMAIL PROTECTED]>: A transcript of the demonstration of the bug:
--- clip --- [EMAIL PROTECTED]:~/tmp/try$ mkdir foo [EMAIL PROTECTED]:~/tmp/try$ cd foo/ [EMAIL PROTECTED]:~/tmp/try/foo$ darcs init [EMAIL PROTECTED]:~/tmp/try/foo$ echo content > file [EMAIL PROTECTED]:~/tmp/try/foo$ darcs add file [EMAIL PROTECTED]:~/tmp/try/foo$ darcs rec addfile ./file Shall I record this patch? (1/2) [ynWsfqadjk], or ? for help: y hunk ./file 1 +content Shall I record this patch? (2/2) [ynWsfqadjk], or ? for help: y What is the patch name? p1 Do you want to add a long comment? [yn] n Finished recording patch 'p1' [EMAIL PROTECTED]:~/tmp/try/foo$ , [EMAIL PROTECTED]:~/tmp/try$ darcs get foo foo2 Copying patch 1 of 1... done! Finished getting. [EMAIL PROTECTED]:~/tmp/try$ cd foo [EMAIL PROTECTED]:~/tmp/try/foo$ rm file [EMAIL PROTECTED]:~/tmp/try/foo$ darcs rec hunk ./file 1 -content Shall I record this patch? (1/2) [ynWsfqadjk], or ? for help: y rmfile ./file Shall I record this patch? (2/2) [ynWsfqadjk], or ? for help: y What is the patch name? rm1 Do you want to add a long comment? [yn] n Finished recording patch 'rm1' [EMAIL PROTECTED]:~/tmp/try/foo$ , [EMAIL PROTECTED]:~/tmp/try$ cd foo2 [EMAIL PROTECTED]:~/tmp/try/foo2$ rm file [EMAIL PROTECTED]:~/tmp/try/foo2$ darcs rec hunk ./file 1 -content Shall I record this patch? (1/2) [ynWsfqadjk], or ? for help: y rmfile ./file Shall I record this patch? (2/2) [ynWsfqadjk], or ? for help: y What is the patch name? rm2 Do you want to add a long comment? [yn] n Finished recording patch 'rm2' [EMAIL PROTECTED]:~/tmp/try/foo2$ darcs pull Pulling from "/home/pkalliok/tmp/try/foo"... Tue Mar 28 08:55:58 EEST 2006 Panu Kalliokoski <[EMAIL PROTECTED]> * rm1 Shall I pull this patch? (1/1) [ynWvxqadjk], or ? for help: y We have conflicts in the following files: ./file Finished pulling. [EMAIL PROTECTED]:~/tmp/try/foo2$ darcs resolve This will trash any unrecorded changes in the working directory. Are you sure? [yn] y Fail: bug in darcs! Problem resolving conflicts in resolve! Please report this to [EMAIL PROTECTED], If possible include the output of 'darcs --exact-version'. [EMAIL PROTECTED]:~/tmp/try/foo2$ 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 <[EMAIL PROTECTED]>**20050212211000] [syncinc with my debian repo after 1.0.0 bug Isaac Jones <[EMAIL PROTECTED]>**20050212205746] [TAG 1.0.2 David Roundy <[EMAIL PROTECTED]>**20050204123805] --- clip --- ---------- messages: 588 nosy: atehwa, droundy, tommy status: unread title: darcs resolve" reports a bug with conflicting file removals ____________________________________ Darcs issue tracker <[EMAIL PROTECTED]> <http://bugs.darcs.net/issue153> ____________________________________ _______________________________________________ darcs-devel mailing list [email protected] http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
