darcs

Issue 750 need clearer documentation for convert

Title need clearer documentation for convert
Priority bug Status resolved
Milestone 2.0.x Resolved in
Superseder Nosy List Serware, darcs-devel, dmitry.kurochkin, gour, kowey, markstos, thorkilnaur, tommy
Assigned To
Topics Conflicts, Darcs2

Created on 2008-03-17.14:52:06 by gour, last changed 2010-06-15.21:20:22 by admin.

Files
File name Uploaded Type Edit Remove
f599716922dedc6fb9d45dd0dfcb5bc404bfc0db gour, 2008-03-17.14:52:05 application/octet-stream
Messages
msg3895 (view) Author: gour Date: 2008-03-17.14:52:05
i!

Few days ago I built darcs by pulling latest patches from 'unstable' on my
x86_64 box.

Attempt to push some patches from laptop to desktop results in:

gour@nitai ~/d/emacs> darcs push -v gour@gaura-nitai.no-ip.org:darcs/emacs
darcs: bug in get_extra commuting patch:
Mon Feb 11 08:51:15 CET 2008  dev@atmarama.org
  * new version of GnusSync

gour@nitai ~> darcs --exact-version
darcs compiled on Mar 12 2008, at 14:36:06
unknown

gour@nitai ~/org> ghc -v
Glasgow Haskell Compiler, Version 6.8.2, for Haskell 98, stage 2 booted by GHC
version 6.8.1

I am submitting patch file which triggers the bug.

Sincerely,
Gour
Attachments
msg3902 (view) Author: markstos Date: 2008-03-18.00:19:10
Gour,

If you were using darcs 1, then I believe this is fixed with darcs 2. If you
were using a recent Darcs 2, then please re-open this bug and we can investigate
further.
msg3903 (view) Author: gour Date: 2008-03-18.06:49:04
Hi!

Excuse me for not mentioning it happens with darcs-2
msg3905 (view) Author: markstos Date: 2008-03-18.13:31:16
Gour,

Thanks for the follow-up. So both repos were probably in the in the old format
or the "hashed" format at the time? 

If you run "darcs convert" one the repo with more patches, and then use "darcs
get" and "obliterate" to create the smaller branch, is the bug still triggered
then? 

Using both the Darcs-2 binary and the new --darcs-2 repo format may be necessary
to avoid the issue. 

I'm marking this as "deferred" now while we wait for your further feedback.
msg3906 (view) Author: gour Date: 2008-03-18.14:05:08
>>>>> "Mark" == Mark Stosberg <bugs@darcs.net> writes:

Mark> Thanks for the follow-up. So both repos were probably in the in
Mark> the old format or the "hashed" format at the time?

Yes, both repos were in the old format and now both are in new format.

Mark> If you run "darcs convert" one the repo with more patches, and
Mark> then use "darcs get" and "obliterate" to create the smaller
Mark> branch, is the bug still triggered then?

Heh, both repos are converted.

Mark> Using both the Darcs-2 binary and the new --darcs-2 repo format
Mark> may be necessary to avoid the issue.

Both repos are in --darcs-2 repo format.

Mark> I'm marking this as "deferred" now while we wait for your further
Mark> feedback.

OK. Yesterday I emailed both repos to droundy.

Sincerely,
Gour

-- 

Gour  | Zagreb, Croatia  | GPG key: C6E7162D
----------------------------------------------------------------
msg3908 (view) Author: markstos Date: 2008-03-18.14:10:06
Thanks for the feedback, Gour. I'll assume that both repos were converted
through one use of "darcs convert", not running "darcs convert" separately on
each repo. 

We can wait to see what result David finds then. In the meantime, I have
upgraded the bug to "urgent" and am suggesting it be looked into before the
Darcs 2 release. 

  Mark
msg3910 (view) Author: droundy Date: 2008-03-18.14:57:35
Hi Gour,

I'm still not entirely clear how you got these repositories.  Did you run darcs
convert once on each repository?

Thanks!

David
msg3925 (view) Author: gour Date: 2008-03-18.18:46:48
>>>>> "David" == David Roundy <bugs@darcs.net> writes:

David> I'm still not entirely clear how you got these repositories.  Did
David> you run darcs convert once on each repository?

Yes...and then tried to push from one (laptop) to the other.

Sincerely,
Gour

-- 

Gour  | Zagreb, Croatia  | GPG key: C6E7162D
----------------------------------------------------------------
msg3927 (view) Author: droundy Date: 2008-03-18.18:50:56
Okay, in that case this is a documentation bug.  You can't run convert on two
related repositories without causing trouble.  I've added a message to this
effect (possibly unclear?), which I'll interpret as resolving this bug.
msg3930 (view) Author: droundy Date: 2008-03-18.18:59:12
On Tue, Mar 18, 2008 at 07:44:27PM +0100, Gour wrote:
> >>>>> "Mark" == Mark Stosberg <bugs@darcs.net> writes:
> 
> Mark> Thanks for the feedback, Gour. I'll assume that both repos were
> Mark> converted through one use of "darcs convert", not running "darcs
> Mark> convert" separately on each repo.
> 
> No. I run 'convert' on each repo separately and do not see why this is
> problematic nor see any note about it in the wiki?

If you visit the wiki you will indeed find a note about this.  Visit the
following URL and then search for convert, and you'll find a warning right
there.

http://wiki.darcs.net/index.html/DarcsTwo

I suppose the warning is not as strong as it should be:

"Moreover, you should ideally only perform this command once per project,
as the conversion is not reversible, and its result is dependent on the
order of patches in your repository. Of course, you can experiment all you
like, but projects should switch to darcs-2 format in unison, and only
after the final release of darcs 2."
-- 
David Roundy
Department of Physics
Oregon State University
msg3932 (view) Author: markstos Date: 2008-03-18.20:52:02
Here's how I updated the wiki:

"The convert command runs slowly. Perform this command once per project, not
once for each repo. The conversion is not reversible and its result is dependent
on the order of patches in your repository. Projects should switch to darcs-2
format in unison. While testers and early adopters may switch now, the safe
option is to switch after the final release of darcs 2."

Since multiple people have made this mistake, the built-in docs for "darcs
convert" perhaps should also be firmer and clearer about this point.
History
Date User Action Args
2008-03-17 14:52:06gourcreate
2008-03-18 00:19:11markstossetstatus: unread -> resolved-in-unstable
nosy: + markstos
messages: + msg3902
2008-03-18 06:49:05goursetstatus: resolved-in-unstable -> unknown
nosy: droundy, tommy, beschmi, kowey, markstos, gour
messages: + msg3903
2008-03-18 13:31:18markstossetstatus: unknown -> deferred
nosy: droundy, tommy, beschmi, kowey, markstos, gour
messages: + msg3905
2008-03-18 14:05:10goursetnosy: droundy, tommy, beschmi, kowey, markstos, gour
messages: + msg3906
2008-03-18 14:10:13markstossetstatus: deferred -> has-patch
priority: bug -> urgent
title: bug in get_extra commuting patch -> bug in get_extra commuting patch with Darcs2
nosy: droundy, tommy, beschmi, kowey, markstos, gour
messages: + msg3908
topic: + Conflicts, Darcs2, Target-2.0
2008-03-18 14:57:38droundysetnosy: droundy, tommy, beschmi, kowey, markstos, gour
messages: + msg3910
2008-03-18 18:46:50goursetnosy: droundy, tommy, beschmi, kowey, markstos, gour
messages: + msg3925
2008-03-18 18:51:05droundysetstatus: has-patch -> resolved
nosy: droundy, tommy, beschmi, kowey, markstos, gour
priority: urgent -> bug
messages: + msg3927
title: bug in get_extra commuting patch with Darcs2 -> need clearer documentation for convert
2008-03-18 18:59:13droundysetstatus: resolved -> unknown
nosy: droundy, tommy, beschmi, kowey, markstos, gour
messages: + msg3930
2008-03-18 20:52:06markstossetnosy: droundy, tommy, beschmi, kowey, markstos, gour
messages: + msg3932
2008-03-19 13:53:05droundysetstatus: unknown -> resolved
nosy: droundy, tommy, beschmi, kowey, markstos, gour
2009-08-06 17:56:53adminsetnosy: + jast, Serware, dmitry.kurochkin, darcs-devel, zooko, dagit, mornfall, simon, thorkilnaur, - droundy, gour
2009-08-06 21:00:38adminsetnosy: - beschmi
2009-08-10 22:18:11adminsetnosy: + gour, - darcs-devel, zooko, jast, dagit, Serware, mornfall
2009-08-25 18:07:46adminsetnosy: + darcs-devel, - simon
2009-08-27 13:56:42adminsetnosy: tommy, kowey, markstos, darcs-devel, thorkilnaur, gour, dmitry.kurochkin
2010-06-15 21:20:20adminsetmilestone: 2.0.x
2010-06-15 21:20:22adminsettopic: - Target-2.0
nosy: + Serware