|
Created on 2009-03-15.14:47:46 by kowey, last changed 2017-07-30.23:59:18 by gh.
msg7468 (view) |
Author: kowey |
Date: 2009-03-15.14:47:41 |
|
I believe this to be a bug and will submit a test for it shortly.
How should darcs behave when there is a changepref conflict?
Marking such a conflict up would be a bit awkward.
Is this by any chance, a feature and not a bug?
|
msg7469 (view) |
Author: kowey |
Date: 2009-03-15.14:59:25 |
|
A UI proposal for how this *should* work:
One way might be for (a) darcs to mark the conflict in the prefs file the same
way it marks regular files and (b) the prefs file parser to be smart enough to
detect conflict markers, and refuse to do anything until you have done
something about it.
I'll also note that the current strategy just seems to be to pick one of the
preferences and ignore the other. It would be worth checking to see if this was
deliberate or just an oversight. We do something similar for marking up file
rename conflicts, I think, and there it is deliberate and somewhat sensible.
Keep in mind that the core correct behaviour for conflicts is to ignore BOTH
sides and go back to square 1. Any conflict marking is built on top of that, in
the working directory.
|
msg7470 (view) |
Author: kowey |
Date: 2009-03-15.15:02:19 |
|
Another word of caution: even if we do decide this is a bug, this may be one of
those situations where we have to enshrine the bug as a feature for darcs-1 and
darcs-2 repositories (and resolve to fix it for darcs-3). Proceed with caution.
|
msg7472 (view) |
Author: kowey |
Date: 2009-03-16.08:17:04 |
|
Petr pointed out this text from help setpref:
Note that merging is not currently implemented for preferences: if two
patches attempt to set the same preference, the last patch applied to
the repository will always take precedence. This is considered a
low-priority bug, because preferences are seldom set.
So it's a known bug.
|
msg8110 (view) |
Author: kowey |
Date: 2009-08-12.10:45:50 |
|
Let's defer this to Darcs 3
|
|
Date |
User |
Action |
Args |
2009-03-15 14:47:46 | kowey | create | |
2009-03-15 14:59:28 | kowey | set | status: unread -> unknown nosy:
kowey, simon, thorkilnaur, dmitry.kurochkin messages:
+ msg7469 |
2009-03-15 15:02:21 | kowey | set | nosy:
kowey, simon, thorkilnaur, dmitry.kurochkin messages:
+ msg7470 |
2009-03-16 08:17:06 | kowey | set | nosy:
kowey, simon, thorkilnaur, dmitry.kurochkin messages:
+ msg7472 |
2009-08-12 10:45:57 | kowey | set | status: unknown -> deferred nosy:
kowey, simon, thorkilnaur, dmitry.kurochkin topic:
+ UI, Target-3.0 messages:
+ msg8110 title: darcs does not report setpref (changepref) conflicts -> darcs does not track setpref (changepref) conflicts |
2009-08-25 17:42:13 | admin | set | nosy:
+ darcs-devel, - simon |
2009-08-27 14:23:37 | admin | set | nosy:
kowey, darcs-devel, thorkilnaur, dmitry.kurochkin |
2010-03-23 23:24:55 | kowey | set | nosy:
- thorkilnaur |
2010-06-15 21:10:41 | admin | set | topic:
- Target-3.0 |
2010-06-15 21:10:42 | admin | set | milestone: 3.0.0 |
2017-07-30 23:59:18 | gh | set | status: deferred -> given-up |
|