darcs

Issue 773 bug in get_extra commuting patch

Title bug in get_extra commuting patch
Priority bug Status duplicate
Milestone Resolved in
Superseder Nosy List darcs-devel, dmitry.kurochkin, kowey, lele, thorkilnaur, tommy
Assigned To
Topics

Created on 2008-03-31.14:44:42 by lele, last changed 2009-08-27.13:57:19 by admin.

Messages
msg4127 (view) Author: lele Date: 2008-03-31.14:44:39
Hi all,

I'm facing an unexpected trouble trying to merge two different
repositories into one. No matter which direction, or darcs1/darcs2, I
always trigger that "bug in get_extra commuting patch".

I tailorized two different subtrees of a Subversion repository into
two distinct darcs repositories.

Since the two are effectively wired to each other, I'd like to have a
single repository with the two subtrees.

So I basically did:

$ cd /tmp
$ darcs get .../tailorized/repo-A
$ cd repo-A
$ darcs pull .../tailorized/repo-B

and I get the error almost immediately at pull time, with the error
reporting a patch in repo-A. The same happens if I swap the order
(that is, trying to pull repo-A into repo-B): in this case, the error
message mention one patch of repo-B.

Then I rebuilt an up-to-date darcs2 binary, and tried the same (with
and without --hashed) with it, obtaining the very same result.

repo-A has 391 patches while repo-B only 113, and as said by
definition the two sets are completely non-overlapping:

$ ls -l repo-A
drwxrwxr-x 6 lele lele 4096 2008-03-31 15:55 _darcs
drwxrwxr-x 7 lele lele 4096 2008-03-31 15:28 gam-database-pg

$ du -sh repo-A
17M

$ ls -l repo-B
drwxrwxr-x 6 lele lele 4096 2008-03-31 15:55 _darcs
drwxrwxr-x 3 lele lele 4096 2008-03-31 15:29 tools

$ du -sh repo-B
1,4M

As the material is completely under GPL, I have no problem sharing it,
should that help in any way. Please, let me know if there's anything
else I could try.

Thank you in advance,
ciao, lele.
-- 
nickname: Lele Gaifax    | Quando vivrò di quello che ho pensato ieri
real: Emanuele Gaifas    | comincerò ad aver paura di chi mi copia.
lele@nautilus.homeip.net |                 -- Fortunato Depero, 1929.
History
Date User Action Args
2008-03-31 14:44:42lelecreate
2008-03-31 14:53:36droundysetpriority: bug
status: unread -> duplicate
nosy: tommy, beschmi, kowey, lele
2009-08-06 21:01:31adminsetnosy: + dmitry.kurochkin, simon, thorkilnaur, - beschmi
2009-08-25 18:09:38adminsetnosy: + darcs-devel, - simon
2009-08-27 13:57:19adminsetnosy: tommy, kowey, darcs-devel, lele, thorkilnaur, dmitry.kurochkin