[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] merging interface
From: |
Olivier Andrieu |
Subject: |
Re: [Monotone-devel] merging interface |
Date: |
Wed, 17 Nov 2004 16:24:11 +0100 (CET) |
> Richard Levitte - VMS Whacker [Wed, 17 Nov 2004]:
> In message <address@hidden> on Wed, 17 Nov 2004 13:34:23 +0000, Bruce
> Stephens <address@hidden> said:
>
> monotone> Really what I'd like is to be left with a working tree with
> monotone> the conflicting files indicated in some way: then I can deal
> monotone> with them in an order that makes sense to me, and I can
> monotone> perform whatever sanity checks on the merged tree that make
> monotone> sense. Then I can make sure that my merge cert actually
> monotone> means something about the revision.
> monotone> Can I do that in some way now?
>
> Very manually, by fetching each head separately, doing a merge
> using your favorite tool, do a commit with the result and add the
> corresponding certs manually. I've got a propagate script that
> goes around the problem that came up with rename certs, which you
> could use as a basis if you want.
Humm no, you can't do this anymore, can you ? Ancestry relations of
revisions does derive from certs, so commit will always create a new
revision with a single ancestor and you'll still have two heads, no
matter what certs you add. AFAIK merge is the only operation that can
produce a revision with more than one ancestor (and thus reduce the
number of heads).
--
Olivier
- [Monotone-devel] Command for changing passphrase; documentation fixes; test cases, Joel Rosdahl, 2004/11/15
- Message not available
- Message not available
- Re: [Monotone-devel] Command for changing passphrase; documentation fixes; test cases, Nathaniel Smith, 2004/11/16
- Re: [Monotone-devel] Command for changing passphrase; documentation fixes; test cases, Joel Rosdahl, 2004/11/16
- Re: [Monotone-devel] Command for changing passphrase; documentation fixes; test cases, Matt Johnston, 2004/11/16
- [Monotone-devel] Status update, Nathaniel Smith, 2004/11/17
- [Monotone-devel] merging interface (was Re: Status update), Bruce Stephens, 2004/11/17
- Re: [Monotone-devel] merging interface, Richard Levitte - VMS Whacker, 2004/11/17
- [Monotone-devel] Re: merging interface, Bruce Stephens, 2004/11/17
- Re: [Monotone-devel] merging interface,
Olivier Andrieu <=
- [Monotone-devel] Re: merging interface, Bruce Stephens, 2004/11/17
- Re: [Monotone-devel] Re: merging interface, Olivier Andrieu, 2004/11/17
- Re: [Monotone-devel] merging interface, Christof Petig, 2004/11/17
- [Monotone-devel] Re: merging interface, Bruce Stephens, 2004/11/17
- Re: [Monotone-devel] merging interface, Richard Levitte - VMS Whacker, 2004/11/17
- [Monotone-devel] Re: merging interface, Bruce Stephens, 2004/11/17
- Re: [Monotone-devel] Re: merging interface, Richard Levitte - VMS Whacker, 2004/11/17
- Re: [Monotone-devel] Re: merging interface, Jon Bright, 2004/11/18
- Re: [Monotone-devel] merging interface, Christof Petig, 2004/11/18
- Re: [Monotone-devel] merging interface (was Re: Status update), derek, 2004/11/17