[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] improving show_conflicts
From: |
Stephen Leake |
Subject: |
Re: [Monotone-devel] improving show_conflicts |
Date: |
Thu, 21 Feb 2008 07:26:24 -0500 |
User-agent: |
Gnus/5.1006 (Gnus v5.10.6) Emacs/22.1 (windows-nt) |
Stephen Leake <address@hidden> writes:
> Derek Scherger <address@hidden> writes:
>
>> Alternatively, update --dry-run and merge --dry-run (or --pretend or
>> --test or whatever)
>
> Given the behavior of merge for N > 2, I think this makes much more
> sense.
On the other hand, for automate, commands should do small operations,
so show_conflicts --merge would be better. I'll have to look at the
code for more insight.
--
-- Stephe
- Re: [Monotone-devel] How to join identical branches?, (continued)
- Re: [Monotone-devel] How to join identical branches?, Markus Schiltknecht, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Markus Schiltknecht, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/14
- Re: [Monotone-devel] How to join identical branches?, Markus Schiltknecht, 2008/02/14
- [Monotone-devel] improving show_conflicts, Stephen Leake, 2008/02/19
- Re: [Monotone-devel] improving show_conflicts, Derek Scherger, 2008/02/20
- Re: [Monotone-devel] improving show_conflicts, Stephen Leake, 2008/02/20
- Re: [Monotone-devel] improving show_conflicts, Derek Scherger, 2008/02/20
- Re: [Monotone-devel] improving show_conflicts, Stephen Leake, 2008/02/21
- Re: [Monotone-devel] improving show_conflicts,
Stephen Leake <=
- Re: [Monotone-devel] How to join identical branches?, William Uther, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/14
- Re: [Monotone-devel] How to join identical branches?, Derek Scherger, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Derek Scherger, 2008/02/17
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/17
- Re: [Monotone-devel] How to join identical branches?, Derek Scherger, 2008/02/18
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/19