importing from git
Christopher Li
hg at chrisli.org
Wed Jun 1 14:22:42 UTC 2005
On Wed, Jun 01, 2005 at 12:45:17PM -0400, Kevin Smith wrote:
> Matt Mackall wrote:
>
> I don't know if it makes sense or not, but here's one opinion:
> http://marc.theaimsgroup.com/?l=git&m=111722553224992&w=2
I am against it too. The 5 parent information is embed in your
previous merge history. You trace back and you see how you get
the 5 parents. Follow this logic every merge should contain every
merged parents in the history?
Unless they do 5 parents in one blow, which is really bad idea.
It try to track more but it doesn't provide what is needed in
auto merge either.
Chris
More information about the Mercurial
mailing list