Created on 2006-07-08.15:52:06 by ngoldberg, last changed 2008-07-24.14:42:40 by kowey.
|
| msg5251 (view) |
Author: kowey |
Date: 2008-07-24.14:42:37 |
|
Marking resolved, then. Thanks!
|
| msg5250 (view) |
Author: tommy |
Date: 2008-07-24.13:53:54 |
|
The (previously) failing repository is an untagged version of a
post-1.0.9 darcs code repository, so it won't make a good
minimal test case.
|
| msg5249 (view) |
Author: tommy |
Date: 2008-07-24.13:50:00 |
|
Darcs 2.0.2 (+ 5 patches) works, and marks the conflicts
successfully in the old-format repository. After I convert the
repository to darcs-2 format, there are no longer any conflicts
to mark. I think they disappear during the lossy conversion of
complicated conflicts.
|
| msg4561 (view) |
Author: kowey |
Date: 2008-05-07.16:05:02 |
|
Tommy,
Just poking.
Does mark-conflicts in darcs 2.0.0 still break on your sample repository?
What about if you convert the repository?
|
| msg2809 (view) |
Author: markstos |
Date: 2008-01-27.06:07:33 |
|
Tommy,
Are you also able to reproduce the bug with Darcs2? And how about after a "darcs
convert" on a repository?
Also, having a minimal test case would also be interesting, if that's possible.
Mark
|
| msg1974 (view) |
Author: tommy |
Date: 2007-08-02.01:26:53 |
|
I now have a repo where I can reproduce this bug, with darcs 1.0.7, 1.0.8, 1.0.9
and current stable.
|
| msg812 (view) |
Author: tommy |
Date: 2006-07-11.23:47:48 |
|
On Sat, Jul 08, 2006 at 03:52:07PM +0000, Noam Goldberg wrote:
> research% darcs resolve
> darcs: bug in darcs!
> Problem resolving conflicts in resolve!user error (Error applying hunk to file ./LAD_Boost.tex)
What does 'darcs check' in this repo print?
|
| msg799 (view) |
Author: ngoldberg |
Date: 2006-07-08.15:52:04 |
|
The following is the output of exact-version and resolve.
Let me know if you need any additional files.
Thank you in advance,
Noam
research% darcs --exact-version
darcs compiled on Mar 4 2006, at 21:34:19
# configured Tue Feb 28 07:02:39 EST 2006
./configure --no-create --no-recursion
Context:
[TAG 1.0.6
Tommy Pettersson <ptp@lysator.liu.se>**20060228111841]
research% darcs resolve
darcs: bug in darcs!
Problem resolving conflicts in resolve!user error (Error applying hunk to file ./LAD_Boost.tex)
Please report this to bugs@darcs.net,
If possible include the output of 'darcs --exact-version'.
|
Browse related patches:
unstable
|
stable
|
| Date |
User |
Action |
Args |
| 2008-07-24 14:42:40 | kowey | set | status: testing -> resolved
nosy:
droundy, tommy, beschmi, kowey, markstos, dagit, ngoldberg
messages:
+ msg5251
assignedto: tommy -> |
| 2008-07-24 13:53:57 | tommy | set | nosy:
droundy, tommy, beschmi, kowey, markstos, dagit, ngoldberg
messages:
+ msg5250 |
| 2008-07-24 13:50:04 | tommy | set | nosy:
droundy, tommy, beschmi, kowey, markstos, dagit, ngoldberg
messages:
+ msg5249 |
| 2008-05-07 16:05:03 | kowey | set | status: deferred -> testing
nosy:
+ dagit
messages:
+ msg4561
title: resolve => Problem resolving conflicts in resolve! (1.0.9) -> mark-conflicts => Problem resolving conflicts in resolve! (1.0.9) |
| 2008-02-16 16:30:26 | markstos | set | status: chatting -> deferred
nosy:
droundy, tommy, beschmi, kowey, markstos, ngoldberg |
| 2008-01-27 06:07:34 | markstos | set | nosy:
+ markstos
title: resolve => Problem resolving conflicts in resolve! (1.0.6) -> resolve => Problem resolving conflicts in resolve! (1.0.9)
messages:
+ msg2809
assignedto: tommy |
| 2007-08-02 07:22:46 | kowey | set | files:
- unnamed |
| 2007-08-02 07:22:33 | kowey | set | topic:
+ Conflicts |
| 2007-08-02 04:36:36 | kowey | set | status: need-info -> chatting
title: resolve => bug in darcs! (1.0.6) -> resolve => Problem resolving conflicts in resolve! (1.0.6) |
| 2007-08-02 01:26:54 | tommy | set | nosy:
droundy, tommy, beschmi, kowey, ngoldberg
messages:
+ msg1974 |
| 2007-03-08 11:31:08 | kowey | set | status: chatting -> need-info
nosy:
+ beschmi, kowey
title: Problem resolving confilicts -> resolve => bug in darcs! (1.0.6) |
| 2006-07-11 23:47:51 | tommy | set | status: unread -> chatting
nosy:
droundy, tommy, ngoldberg
messages:
+ msg812 |
| 2006-07-08 15:52:06 | ngoldberg | create | |
|
