|
From: | Derek Scherger |
Subject: | Re: [Monotone-devel] improving show_conflicts |
Date: | Wed, 20 Feb 2008 21:42:00 -0700 |
User-agent: | Thunderbird 2.0.0.9 (X11/20071116) |
Stephen Leake wrote:
If I ultimately want to run merge successfully, I want show_conflicts to do exactly what merge would do.
Note that merge will merge N heads in N-1 steps 2 heads at a time, without stopping. I'm not sure how helpful show conflicts output would be in cases where N > 2.
But if I ultimately want to run update succesfully, I want show_conflicts to do exactly what update would do. How about 'show_conflicts --merge' and 'show_conflicts --update', in addition to the current 'show_conflicts rev rev'?
Alternatively, update --dry-run and merge --dry-run (or --pretend or --test or whatever)
Cheers, Derek
[Prev in Thread] | Current Thread | [Next in Thread] |