|
Created on 2008-10-26.11:45:45 by galbolle, last changed 2009-08-27.14:34:01 by admin.
msg6470 (view) |
Author: galbolle |
Date: 2008-10-26.11:45:43 |
|
I'd like to optionally have a mode for files in which hunks break on empty
lines, in order to minimise conflicts on files where paragraphs have semantic
value (be it latex files or haskell files with functions separated by blank lines).
|
msg7554 (view) |
Author: twb |
Date: 2009-03-29.06:54:20 |
|
On Sun, Oct 26, 2008 at 12:45:43AM +0000, Florent Becker wrote:
> I'd like to optionally have a mode for files in which hunks break on empty
> lines, in order to minimise conflicts on files where paragraphs have semantic
> value (be it latex files or haskell files with functions separated by blank lines).
What happens when a hunk adds or removes a newline? This sounds like
a pretty invasive, backwards-incompatible change to me. Can you think
of a way to make it backwards-compatible?
|
msg7559 (view) |
Author: galbolle |
Date: 2009-03-29.10:01:11 |
|
Note that this would not be a new type of patches, just a modification on how
record generates the hunks. Thus I don't think it would create any
backward-incompatibility: any older darcs to which i send changes sees normal hunks.
This could be triggered by record --paragraphs, but i'd like to be able to state
rules that say for example than any .tex file in my repo should be treated that way.
|
msg8348 (view) |
Author: kowey |
Date: 2009-08-22.12:08:17 |
|
Would resolving issue126 be good enough?
We need to fight against flag proliferation. Each flag is a pebble. Get enough
pebbles and you've got an avalanche (run for your life!). The ideal is to make
darcs do what everybody wants not by adding more options but by adding just the
right options that they can combine to get the desired effect.
|
msg8527 (view) |
Author: kowey |
Date: 2009-08-27.08:46:24 |
|
Marking this as wont-fix for now as it seems this would be subsumed by a good
hunk-splitting interface.
|
|
Date |
User |
Action |
Args |
2008-10-26 11:45:46 | galbolle | create | |
2009-03-29 06:54:23 | twb | set | status: unread -> unknown nosy:
+ twb messages:
+ msg7554 |
2009-03-29 10:01:16 | galbolle | set | nosy:
kowey, dagit, simon, twb, thorkilnaur, dmitry.kurochkin, galbolle messages:
+ msg7559 |
2009-08-10 23:49:29 | admin | set | nosy:
- dagit |
2009-08-22 12:08:20 | kowey | set | status: unknown -> waiting-for nosy:
kowey, simon, twb, thorkilnaur, dmitry.kurochkin, galbolle messages:
+ msg8348 assignedto: galbolle |
2009-08-25 17:32:40 | admin | set | nosy:
+ darcs-devel, - simon |
2009-08-27 08:46:28 | kowey | set | status: waiting-for -> wont-fix nosy:
kowey, darcs-devel, twb, thorkilnaur, dmitry.kurochkin, galbolle messages:
+ msg8527 topic:
+ UI assignedto: galbolle -> superseder:
+ wish: ablity to split and otherwise record a hunk in record |
2009-08-27 14:34:01 | admin | set | nosy:
kowey, darcs-devel, twb, thorkilnaur, dmitry.kurochkin, galbolle |
|