[PATCH] extdiff: single file diffs from the wc without making a copy

Benoit Boissinot bboissin at gmail.com
Mon Aug 6 12:38:50 CDT 2007


On 8/6/07, Brad Schick <schickb at gmail.com> wrote:
> Benoit Boissinot wrote:
> > Can you split the patch for the different changes (you can use
> > patchbomb to mail the series) ?
> >
> > something like:
> > - un-nest (what was the reason for this ?)
> > - makes less chatty
> > - use in place diff
> >
> Sure. Although my personal development style isn't nearly so neat.
> What's a good way to handle this? Just clone the tree again and redo the
> changes in the desired configuration? Also would you prefer that I make
> these in a tree other than the main stable repo?

Best is to use the dev repo since those changes are not really bugfixes.
You probably won't avoid redoing all the changes step by step,
although having the result will allow you to do some copy paste if
needed.
A very useful tool is indeed mq, since it allows you to edit any patch
in the series (and to update to latest tip easily).
A good indication that a patch does too much thing is: a "unreadable"
diff (big chunk of '+' and a big chunk of '-' which isn't just a code
move) or a changelog with multiple unrelated points.

>
> I un-nest two functions that create temporary clones because they are
> useful outside of extdiff. For example my gui extension lets you "view"
> old revisions and uses these functions to make copies. In fact the one
> function that makes a temporary clone of an old revision is probably
> useful enough to put in hg proper.
>
fine, it might be already there in archival.py

regards,

Benoit


More information about the Mercurial-devel mailing list