[darcs-users] Re: [darcs-devel] bug in resolve

Sat Jun 11 07:42:57 UTC 2005

On Wed, May 11, 2005 at 05:47:51AM -0700, Tupshin Harper wrote:
> I believe I've encountered two bugs, or possibly just one root cause.
> 
> I have repo "a" which has 3 patches, with a deliberate conflict.
> patch 1 adds a file("a.txt") and two lines, patch two removes the file,
> and patch 3 adds a line to the file.
> 
> The repo is left with current containing a.txt and the two lines added
> in patch1, but the working dir doesn't have a, and whatsnew shows the
> file being removed.
> 
> Problem 1 (hmm...after writing this, I notice that this is probably the
> same as bug #170:
> When the repository is in that state, darcs resolve says:
> Fail: bug in darcs!
> Problem resolving conflicts in resolve!
> Please report this to bugs at darcs.net,
> If possible include the output of 'darcs --exact-version'.
> 
> At the least, it seems that resolve is lying about trashing unrecorded
> changes in the working directory.
> 
> 
> Possible problem 2:
> If  I do a get of repo a (to repo b), a.txt exists in both current and
> working.
> 
> But if I do a mkdir c, cd c, darcs init, darcs pull -a ../a, I get a
> conflict message and a.txt is in current but not working. (and c then
> suffers from the same bug in resolve that a did).
> 
> Is there a theoretical or practical reason why pull -a and get should
> leave the working in different states?
> 
> If anybody cares, a tarball of repo a is attached.
> 
> -Tupshin
> 
> 
> darcs --exact-version is:
> 
> 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]
> 
> 


> _______________________________________________
> darcs-devel mailing list
> darcs-devel at darcs.net
> http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel


On Fri, Jun 10, 2005 at 10:50:45PM +0000, Mark Stosberg wrote:
> Tupshin,
> 
> It appears no one responded to your bug report, which I appreciate you
> sharing. I suggest you add the first part as a comment to bug #170, and
> submit the rest as a new bug report. As developers have time, someone
> will address the issue in due time.
> 
> Your question about why get and pull return different results is
> interesting to me, too. 
> 
>     Mark
> 
> On 2005-05-11, Tupshin Harper <tupshin at tupshin.com> wrote:
> > This is a multi-part message in MIME format.
> > --------------090304040003080904070102
> > Content-Type: text/plain; charset=ISO-8859-1
> > Content-Transfer-Encoding: 7bit
> >
> > I believe I've encountered two bugs, or possibly just one root cause.
> >
> > I have repo "a" which has 3 patches, with a deliberate conflict.
> > patch 1 adds a file("a.txt") and two lines, patch two removes the file,
> > and patch 3 adds a line to the file.
> >
> > The repo is left with current containing a.txt and the two lines added
> > in patch1, but the working dir doesn't have a, and whatsnew shows the
> > file being removed.
> >
> > Problem 1 (hmm...after writing this, I notice that this is probably the
> > same as bug #170:
> > When the repository is in that state, darcs resolve says:
> > Fail: bug in darcs!
> > Problem resolving conflicts in resolve!
> > Please report this to bugs at darcs.net,
> > If possible include the output of 'darcs --exact-version'.
> >
> > At the least, it seems that resolve is lying about trashing unrecorded
> > changes in the working directory.
> >
> >
> > Possible problem 2:
> > If  I do a get of repo a (to repo b), a.txt exists in both current and
> > working.
> >
> > But if I do a mkdir c, cd c, darcs init, darcs pull -a ../a, I get a
> > conflict message and a.txt is in current but not working. (and c then
> > suffers from the same bug in resolve that a did).
> >
> > Is there a theoretical or practical reason why pull -a and get should
> > leave the working in different states?
> >
> > If anybody cares, a tarball of repo a is attached.
> >
> > -Tupshin
> >
> >
> > darcs --exact-version is:
> >
> > 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]
> >
> >
> >
> > --------------090304040003080904070102
> > Content-Type: application/x-compressed-tar;
> >  name="a.tgz"
> > Content-Transfer-Encoding: base64
> > Content-Disposition: inline;
> >  filename="a.tgz"
> >
> > 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
> > --------------090304040003080904070102
> > Content-Type: text/plain; charset="us-ascii"
> > MIME-Version: 1.0
> > Content-Transfer-Encoding: 7bit
> > Content-Disposition: inline
> >
> > _______________________________________________
> > darcs-devel mailing list
> > darcs-devel at darcs.net
> > http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
> >
> > --------------090304040003080904070102--
> >
> >
> 
> 
> -- 
> --
>  . . . . . . . . . . . . . . . . . . . . . . . . . . . 
>    Mark Stosberg            Principal Developer  
>    mark at summersault.com     Summersault, LLC     
>    765-939-9301 ext 202     database driven websites
>  . . . . . http://www.summersault.com/ . . . . . . . .
> 
> 
> _______________________________________________
> darcs-devel mailing list
> darcs-devel at darcs.net
> http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel


-- 
Tommy Pettersson <ptp at lysator.liu.se>