|
Created on 2010-03-03.14:31:54 by attila.lendvai, last changed 2010-06-16.14:40:12 by kowey.
File name |
Uploaded |
Type |
Edit |
Remove |
changes.txt
|
attila.lendvai,
2010-03-03.19:33:28
|
text/plain |
|
|
msg10109 (view) |
Author: attila.lendvai |
Date: 2010-03-03.14:31:50 |
|
unfortunately the repo contains sensitive data, so i can't send it.
i'm trying to convert a branched project to darcs2, but both branches
evolved, so i need to create a repo with all the patches. this repo is
such a try, although pulling all patches is exponential... but the point
is that it has loads of conflicting patches, up to the limit still
pullable in a darcs1 repo.
then i've converted that repo to darcs2. then i darcs get it to unpull
patches to form the darcs2 repo of one of the branches.
alendvai@ed101:~/Desktop/conversion$ darcs --version
2.4 (release)
alendvai@ed101:~/Desktop/conversion$ darcs get merge.without-deadly-
conflicts.darcs2/ delme
Copying patches, to get lazy repository hit ctrl-C...
Finished getting.
alendvai@ed101:~/Desktop/conversion$ cd delme/
alendvai@ed101:~/Desktop/conversion/delme$ darcs check --complete
The repository is consistent!
alendvai@ed101:~/Desktop/conversion/delme$ darcs unpull
Wed Jan 13 11:22:37 CET 2010 levente.meszaros@gmail.com
* Refactor www according to new structure.
Shall I unpull this patch? (1/86) [ynWvplxdaqjk], or ? for help: a
Really unpull all undecided patches? y
Finished unpulling.
alendvai@ed101:~/Desktop/conversion/delme$ darcs check --complete
The repository is consistent!
Hash mismatch(es)!
notes
index:
c60e6dbbc670805cac905cbf336ba403cbf8399b5d57047e4acc61a77c0b47f6
working:
5fb6151cb223d4857a38635ed0bc369366bb07af0d99aaa595770f3c75aa39a0
Bad index.
alendvai@ed101:~/Desktop/conversion/delme$ darcs repair
The repository is already consistent, no changes made.
Hash mismatch(es)!
notes
index:
c60e6dbbc670805cac905cbf336ba403cbf8399b5d57047e4acc61a77c0b47f6
working:
5fb6151cb223d4857a38635ed0bc369366bb07af0d99aaa595770f3c75aa39a0
Bad index discarded.
alendvai@ed101:~/Desktop/conversion/delme$ darcs check --complete
The repository is consistent!
alendvai@ed101:~/Desktop/conversion/delme$
|
msg10110 (view) |
Author: kowey |
Date: 2010-03-03.14:51:45 |
|
I think we should aim for a 2.4.1 bugfix release if possible.
The good news is that we can reproduce it systematically
(so Attila, if you would be so kind as to tarball that somewhere you can
pull it up, and maybe even write yourself a shell script so we can check
back with you later, that'd be great).
The bad news is that we don't have a minimal test case. We have a
semi-formal boil-down procedure for reducing complicated repositories
with bugs to minimal ones with the same bugs, but it takes a lot of
patience!
If you have the time to devote to this, Attila, it would be a help!
http://wiki.darcs.net/Forensics
... but I'm not counting on it because it really is super-involved, and
you basically have to dedicate yourself to it for at least a few hours.
Meanwhile, we need to come up with some way of turning this into a test
case. :-(
|
msg10112 (view) |
Author: attila.lendvai |
Date: 2010-03-03.19:28:10 |
|
err, hrm.
i see another one of this, but as far as i remember i have not unpulled
anything from this repo. i did probably a few amend, though...
still on darcs 2.4
|
msg10113 (view) |
Author: attila.lendvai |
Date: 2010-03-03.19:33:28 |
|
attaching a file that contains the "darcs changes -s" up to the point i
have unpulled when the index corruption happened.
Attachments
|
msg10114 (view) |
Author: mornfall |
Date: 2010-03-03.19:42:42 |
|
Bingo, reproduced. Luckily, this is a silly bug that's not related to
either the darcs-2 format or conflicts. Still urgent and something to be
fixed in 2.4.1, but not a mass-panic material.
20:40:09 | morn@twi:/tmp/x -> darcs init
20:40:12 | morn@twi:/tmp/x -> l
_darcs/
20:40:12 | morn@twi:/tmp/x -> mkdir a b
20:40:16 | morn@twi:/tmp/x -> echo x > a/x
20:40:21 | morn@twi:/tmp/x -> echo y > b/y
20:40:25 | morn@twi:/tmp/x -> darcs rec -lam initial
Finished recording patch 'initial'
20:40:28 | morn@twi:/tmp/x -> darcs wh
No changes!
20:40:30 | morn@twi:/tmp/x -> darcs check
The repository is consistent!
20:40:33 | morn@twi:/tmp/x -> darcs mv a/x b/
20:40:38 | morn@twi:/tmp/x -> darcs check
The repository is consistent!
Hash mismatch(es)!
a
index:
4e36eace85956d1aeb6749c5e889a88697535133ef507be5365d2303ad7ae9f7
working:
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
Bad index.
|
msg10115 (view) |
Author: kowey |
Date: 2010-03-03.19:49:03 |
|
RAAH!! :-)
Please make a test case of that...
|
msg10140 (view) |
Author: kowey |
Date: 2010-03-09.19:59:47 |
|
Hi Petr, I think this should get fixed for 2.4.1 if at all possible.
Agreed?
(I'm just trying to sift through the remaining Target-2.4 bugs to give
Reinier a hand for 2.4.1)
|
msg10298 (view) |
Author: mornfall |
Date: 2010-03-19.16:17:46 |
|
(I still don't have a fix for this. I'll look into it.)
|
msg10506 (view) |
Author: mornfall |
Date: 2010-03-25.10:08:14 |
|
The following patch updated the status of issue1756 to be resolved:
* Resolve issue1756: new h-s handles file removals correctly in Index.
Ignore-this: bbedaa58cc6630492efed346332ee21d
|
msg10514 (view) |
Author: kowey |
Date: 2010-03-25.12:19:39 |
|
I'd like to re-open this and recommend that we put together a regression
test based on msg10114
See also
http://lists.osuosl.org/pipermail/darcs-users/2010-March/023476.html
No cutting corners :-)
|
msg10517 (view) |
Author: kowey |
Date: 2010-03-25.15:00:45 |
|
Doh, there was a test after all; I just got confused. Also, Petr
reports that the email linked is unrelated. OK let's resolve this again.
|
msg10797 (view) |
Author: tux_rocker |
Date: 2010-04-23.15:24:41 |
|
The following patch updated the status of issue1756 to be resolved:
* resolve issue1756: bump hashed-storage dependency to 0.4.10
Ignore-this: c59e8582416191a8d55b72ae511f70b3
|
msg11379 (view) |
Author: tux_rocker |
Date: 2010-06-13.17:00:44 |
|
The following patch updated the status of issue1756 to be resolved-in-stable:
* resolve issue1756: bump hashed-storage dependency to 0.4.10
Ignore-this: c59e8582416191a8d55b72ae511f70b3
|
msg11389 (view) |
Author: mornfall |
Date: 2010-06-13.17:15:51 |
|
The following patch updated the status of issue1756 to be resolved-in-stable:
* Resolve issue1756: new h-s handles file removals correctly in Index.
Ignore-this: bbedaa58cc6630492efed346332ee21d
|
|
Date |
User |
Action |
Args |
2010-03-03 14:31:54 | attila.lendvai | create | |
2010-03-03 14:51:56 | kowey | set | priority: critical status: unknown -> needs-reproduction topic:
+ Conflicts, Regression, Target-2.4, Hashed messages:
+ msg10110 nosy:
+ kowey |
2010-03-03 19:28:20 | attila.lendvai | set | messages:
+ msg10112 |
2010-03-03 19:33:47 | attila.lendvai | set | files:
+ changes.txt messages:
+ msg10113 |
2010-03-03 19:42:51 | mornfall | set | priority: critical -> urgent nosy:
+ mornfall topic:
- Conflicts messages:
+ msg10114 |
2010-03-03 19:49:05 | kowey | set | messages:
+ msg10115 |
2010-03-09 19:59:49 | kowey | set | status: needs-reproduction -> needs-implementation assignedto: mornfall messages:
+ msg10140 |
2010-03-19 16:17:49 | mornfall | set | messages:
+ msg10298 title: darcs unpull leaves a bad index behind in a darcs2 repo -> moving files between directories breaks index |
2010-03-23 22:14:09 | ganesh | link | patch200 issues |
2010-03-25 10:08:17 | mornfall | set | status: needs-implementation -> resolved nosy:
+ bugs messages:
+ msg10506 |
2010-03-25 12:19:42 | kowey | set | status: resolved -> needs-reproduction messages:
+ msg10514 |
2010-03-25 15:00:47 | kowey | set | status: needs-reproduction -> resolved messages:
+ msg10517 |
2010-04-23 15:24:41 | tux_rocker | set | nosy:
+ tux_rocker messages:
+ msg10797 |
2010-06-13 17:00:45 | tux_rocker | set | status: resolved -> resolved-in-stable messages:
+ msg11379 |
2010-06-13 17:15:52 | mornfall | set | messages:
+ msg11389 |
2010-06-15 21:31:17 | admin | set | milestone: 2.4.x |
2010-06-15 21:31:18 | admin | set | topic:
- Target-2.4 |
2010-06-15 22:14:26 | admin | set | status: resolved-in-stable -> resolved |
2010-06-15 22:14:27 | admin | set | resolvedin: 2.5.0 |
2010-06-16 14:40:12 | kowey | set | resolvedin: 2.5.0 -> 2.4.x |
|