[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Commit a child of 2 parents
From: |
Yury Polyanskiy |
Subject: |
Re: [Monotone-devel] Commit a child of 2 parents |
Date: |
Sun, 15 Jan 2006 19:59:55 -0500 |
Thanks all for replies!
I was 99% sure that the solution would be to commit my merged tree as a
child to revA and then call some fancy "monotone db execute 'insert...'"
to draw an additional edge in revision graph from revB to a newly
created revC.
Does anyone has a short explanation why such ``drawing'' is impossible?
What does it ruin?
Best wishes,
Yury.
On Sun, 2006-01-15 at 15:35 -0800, Nathaniel Smith wrote:
> As others have noted, there's no sane way to do this at the moment.
> Which is totally lame; I'm sorry. But, now that we have rosters
> landed in mainline, getting this sort of interface to merging
> implemented is a high priority, and very doable; we have a design and
> everything:
> http://venge.net/monotone/wiki/MergeViaWorkingDir
> It's just a matter of someone finding the time to make it happen.
>
> (If you are/have any bored hacker friends, it's probably no more than a
> few days work... ;-).)
>
> -- Nathaniel
>
- [Monotone-devel] Commit a child of 2 parents, Yury Polyanskiy, 2006/01/15
- Re: [Monotone-devel] Commit a child of 2 parents, Timothy Brownawell, 2006/01/15
- Re: [Monotone-devel] Commit a child of 2 parents, Richard Levitte - VMS Whacker, 2006/01/15
- Re: [Monotone-devel] Commit a child of 2 parents, Daniel Carosone, 2006/01/15
- Re: [Monotone-devel] Commit a child of 2 parents, Nathaniel Smith, 2006/01/15
- Re: [Monotone-devel] Commit a child of 2 parents,
Yury Polyanskiy <=
- Re: [Monotone-devel] Commit a child of 2 parents, Daniel Carosone, 2006/01/15
- Re: [Monotone-devel] Commit a child of 2 parents, Nathaniel Smith, 2006/01/15
- Re: [Monotone-devel] Commit a child of 2 parents, Yury Polyanskiy, 2006/01/15
- Re: [Monotone-devel] Commit a child of 2 parents, Daniel Carosone, 2006/01/15
- Re: [Monotone-devel] Commit a child of 2 parents, Timothy Brownawell, 2006/01/15
- Re: [Monotone-devel] Commit a child of 2 parents, Daniel Carosone, 2006/01/15
- Re: [Monotone-devel] Commit a child of 2 parents, Yury Polyanskiy, 2006/01/15
- Re: [Monotone-devel] Commit a child of 2 parents, Daniel Carosone, 2006/01/15
- Re: [Monotone-devel] Commit a child of 2 parents, Ethan Blanton, 2006/01/16
- Re: [Monotone-devel] Commit a child of 2 parents, Daniel Carosone, 2006/01/16