[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?
From: |
Bruce Stephens |
Subject: |
[Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ? |
Date: |
Tue, 03 Oct 2006 19:20:00 +0100 |
User-agent: |
Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) |
Thomas Keller <address@hidden> writes:
[...]
> This means that two files/directories are equally named but have no
> common ancestry. However I can't tell you what two entries these are
> from the node numbers. Note to devs: Wasn't this supposed to be made
> more user friendly i.e. so it outputs file paths instead of those
> numbers?
If I understand things correctly in the case of unrelated revisions
the roots will always conflict in this way. Hence merge_into_dir.
(And, possibly, pivot_root, but I think merge_into_dir is intended for
this situation.)
- [Monotone-devel] How do I merge 2 unrelated branches into 1 ?, Dmitry Kakurin, 2006/10/03
- Re: [Monotone-devel] How do I merge 2 unrelated branches into 1 ?, Thomas Keller, 2006/10/03
- [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?,
Bruce Stephens <=
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Matthew A. Nicholson, 2006/10/04
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Nathaniel Smith, 2006/10/04
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Dmitry Kakurin, 2006/10/05
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Daniel Carosone, 2006/10/05
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Daniel Carosone, 2006/10/05
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Dmitry Kakurin, 2006/10/05
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Daniel Carosone, 2006/10/05
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Dmitry Kakurin, 2006/10/06
- [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Bruce Stephens, 2006/10/06
- Re: [Monotone-devel] Re: How do I merge 2 unrelated branches into 1 ?, Larry Hastings, 2006/10/06