首页 \ 问答 \ Mercurial Log Graph并发症(Mercurial Log Graph Complications)

Mercurial Log Graph并发症(Mercurial Log Graph Complications)

 好的 - 当我使用Mercurial和版本控制系统时，我肯定会学到很多东西，但我真的很困惑为什么我的三个机器上的我的一个存储库（称之为项目-α）的本地副本我使用（机器1，机器2和机器3）是不同的。 值得注意的是，他们没有共享相同的提示。 
 

 我希望有人可以向我解释这个问题，并且还提供一些解释，说明如何避免必须完全“合并”分支（这就是首先出现这种复杂情况的原因）。 如果有人可以提供一个例子来说明某些情况会迫使我在一台机器上“合并”，那将是非常棒的，而在另一台机器上，如果没有它就完全没问题。 
 

 为了澄清，我包括了 
 

hg log --graph

 

 我正在使用的三台机器中的每一台机器的命令（但只是在它们开始不同的地方，因为它是我正在研究的一个很长的项目）。 
 

 机器1 
 

@  changeset:   88:e8aafce5753a
|  tag:         tip
|  user:        Your Name <>
|  date:        Mon Jan 06 15:30:15 2014 -0500
|  summary:     
|
o  changeset:   87:5d76250aad71
|  user:        Your Name <>
|  date:        Mon Jan 06 11:32:53 2014 -0500
|  summary:     
|
o    changeset:   86:4788926f4dc9
|\   parent:      84:caf2a2a127e0
| |  parent:      85:682beb5c2a22
| |  user:        Your Name <>
| |  date:        Thu Jan 02 12:52:17 2014 -0500
| |  summary:     
| |
| o  changeset:   85:682beb5c2a22
| |  parent:      83:bde4e46678d8
| |  user:        Your Name <>
| |  date:        Thu Jan 02 12:38:45 2014 -0500
| |  summary:     
| |
o |  changeset:   84:caf2a2a127e0
| |  parent:      82:729da698a926
| |  user:        Your Name <>
| |  date:        Tue Dec 17 15:44:17 2013 -0500
| |  summary:     
| |
| o  changeset:   83:bde4e46678d8
|/   user:        Your Name <>
|    date:        Wed Jan 01 22:20:54 2014 -0500
|    summary:     
|
o  changeset:   82:729da698a926
|  user:        Your Name <>
|  date:        Mon Dec 16 12:41:54 2013 -0500
|  summary:     

 

 机器2 
 

@  changeset:   88:e8aafce5753a
|  tag:         tip
|  user:        Your Name <>
|  date:        Mon Jan 06 15:30:15 2014 -0500
|  summary:     
|
o  changeset:   87:5d76250aad71
|  user:        Your Name <>
|  date:        Mon Jan 06 11:32:53 2014 -0500
|  summary:     
|
o    changeset:   86:4788926f4dc9
|\   parent:      83:caf2a2a127e0
| |  parent:      85:682beb5c2a22
| |  user:        Your Name <>
| |  date:        Thu Jan 02 12:52:17 2014 -0500
| |  summary:     
| |
| o  changeset:   85:682beb5c2a22
| |  user:        Your Name <>
| |  date:        Thu Jan 02 12:38:45 2014 -0500
| |  summary:     
| |
| o  changeset:   84:bde4e46678d8
| |  parent:      82:729da698a926
| |  user:        Your Name <>
| |  date:        Wed Jan 01 22:20:54 2014 -0500
| |  summary:     
| |
o |  changeset:   83:caf2a2a127e0
|/   user:        Your Name <>
|    date:        Tue Dec 17 15:44:17 2013 -0500
|    summary:     
|
o  changeset:   82:729da698a926
|  user:        Your Name <>
|  date:        Mon Dec 16 12:41:54 2013 -0500
|  summary:     

 

 机器3 
 

o  changeset:   89:e8aafce5753a
|  tag:         tip
|  user:        Your Name <>
|  date:        Mon Jan 06 15:30:15 2014 -0500
|  summary:     
|
o  changeset:   88:5d76250aad71
|  user:        Your Name <>
|  date:        Mon Jan 06 11:32:53 2014 -0500
|  summary:     
|
o    changeset:   87:4788926f4dc9
|\   parent:      83:caf2a2a127e0
| |  parent:      85:682beb5c2a22
| |  user:        Your Name <>
| |  date:        Thu Jan 02 12:52:17 2014 -0500
| |  summary:     
| |
+---@  changeset:   86:eab05f7f7ab6
| |/   parent:      83:caf2a2a127e0
| |    parent:      85:682beb5c2a22
| |    user:        Your Name <>
| |    date:        Thu Jan 02 12:52:31 2014 -0500
| |    summary:     
| |
| o  changeset:   85:682beb5c2a22
| |  user:        Your Name <>
| |  date:        Thu Jan 02 12:38:45 2014 -0500
| |  summary:     
| |
| o  changeset:   84:bde4e46678d8
| |  parent:      82:729da698a926
| |  user:        Your Name <>
| |  date:        Wed Jan 01 22:20:54 2014 -0500
| |  summary:     
| |
o |  changeset:   83:caf2a2a127e0
|/   user:        Your Name <>
|    date:        Tue Dec 17 15:44:17 2013 -0500
|    summary:     
|
o  changeset:   82:729da698a926
|  user:        Your Name <>
|  date:        Mon Dec 16 12:41:54 2013 -0500
|  summary:     

 

 首先我要说的是，我理解存在一些差异仅仅是因为某些机器上的某些更改被推到了其他机器上。 机器1和2是我使用的主要机器，它显然没有太大差别。 我关心的是Machine 3，它目前有3个头，还有一个额外的变更集（89而不是88）。 我对发生了什么感到困惑，我怎么能解决这个问题，我很想知道我做了什么导致这一点，以便下次我可以避免这种行为。 提前致谢！ 

Okay - I'm definitely learning a lot about Mercurial and version control systems more and more as I use them, but I'm really confused about why my local copies of one of my repositories (call it project-alpha) on three machines I use (machine 1, machine 2, and machine 3) are different. Notably, they do not share the same tip.
 

I was hoping somebody could explain this to me, and in addition offer some explanation as to how I may avoid having to "merge" branches altogether (which is how this complication came up in the first place). It would be awesome if somebody could provide an example of how certain circumstances will force me to "merge" on one machine, whereas on another it is perfectly fine without.
 

For clarification, I am including the 
 

hg log --graph

 

commands for each of the three machines I am using (but only where they begin to differ, since it's a long project I'm working on). 
 

Machine 1
 

@  changeset:   88:e8aafce5753a
|  tag:         tip
|  user:        Your Name <>
|  date:        Mon Jan 06 15:30:15 2014 -0500
|  summary:     
|
o  changeset:   87:5d76250aad71
|  user:        Your Name <>
|  date:        Mon Jan 06 11:32:53 2014 -0500
|  summary:     
|
o    changeset:   86:4788926f4dc9
|\   parent:      84:caf2a2a127e0
| |  parent:      85:682beb5c2a22
| |  user:        Your Name <>
| |  date:        Thu Jan 02 12:52:17 2014 -0500
| |  summary:     
| |
| o  changeset:   85:682beb5c2a22
| |  parent:      83:bde4e46678d8
| |  user:        Your Name <>
| |  date:        Thu Jan 02 12:38:45 2014 -0500
| |  summary:     
| |
o |  changeset:   84:caf2a2a127e0
| |  parent:      82:729da698a926
| |  user:        Your Name <>
| |  date:        Tue Dec 17 15:44:17 2013 -0500
| |  summary:     
| |
| o  changeset:   83:bde4e46678d8
|/   user:        Your Name <>
|    date:        Wed Jan 01 22:20:54 2014 -0500
|    summary:     
|
o  changeset:   82:729da698a926
|  user:        Your Name <>
|  date:        Mon Dec 16 12:41:54 2013 -0500
|  summary:     

 

Machine 2
 

@  changeset:   88:e8aafce5753a
|  tag:         tip
|  user:        Your Name <>
|  date:        Mon Jan 06 15:30:15 2014 -0500
|  summary:     
|
o  changeset:   87:5d76250aad71
|  user:        Your Name <>
|  date:        Mon Jan 06 11:32:53 2014 -0500
|  summary:     
|
o    changeset:   86:4788926f4dc9
|\   parent:      83:caf2a2a127e0
| |  parent:      85:682beb5c2a22
| |  user:        Your Name <>
| |  date:        Thu Jan 02 12:52:17 2014 -0500
| |  summary:     
| |
| o  changeset:   85:682beb5c2a22
| |  user:        Your Name <>
| |  date:        Thu Jan 02 12:38:45 2014 -0500
| |  summary:     
| |
| o  changeset:   84:bde4e46678d8
| |  parent:      82:729da698a926
| |  user:        Your Name <>
| |  date:        Wed Jan 01 22:20:54 2014 -0500
| |  summary:     
| |
o |  changeset:   83:caf2a2a127e0
|/   user:        Your Name <>
|    date:        Tue Dec 17 15:44:17 2013 -0500
|    summary:     
|
o  changeset:   82:729da698a926
|  user:        Your Name <>
|  date:        Mon Dec 16 12:41:54 2013 -0500
|  summary:     

 

Machine 3
 

o  changeset:   89:e8aafce5753a
|  tag:         tip
|  user:        Your Name <>
|  date:        Mon Jan 06 15:30:15 2014 -0500
|  summary:     
|
o  changeset:   88:5d76250aad71
|  user:        Your Name <>
|  date:        Mon Jan 06 11:32:53 2014 -0500
|  summary:     
|
o    changeset:   87:4788926f4dc9
|\   parent:      83:caf2a2a127e0
| |  parent:      85:682beb5c2a22
| |  user:        Your Name <>
| |  date:        Thu Jan 02 12:52:17 2014 -0500
| |  summary:     
| |
+---@  changeset:   86:eab05f7f7ab6
| |/   parent:      83:caf2a2a127e0
| |    parent:      85:682beb5c2a22
| |    user:        Your Name <>
| |    date:        Thu Jan 02 12:52:31 2014 -0500
| |    summary:     
| |
| o  changeset:   85:682beb5c2a22
| |  user:        Your Name <>
| |  date:        Thu Jan 02 12:38:45 2014 -0500
| |  summary:     
| |
| o  changeset:   84:bde4e46678d8
| |  parent:      82:729da698a926
| |  user:        Your Name <>
| |  date:        Wed Jan 01 22:20:54 2014 -0500
| |  summary:     
| |
o |  changeset:   83:caf2a2a127e0
|/   user:        Your Name <>
|    date:        Tue Dec 17 15:44:17 2013 -0500
|    summary:     
|
o  changeset:   82:729da698a926
|  user:        Your Name <>
|  date:        Mon Dec 16 12:41:54 2013 -0500
|  summary:     

 

Let me first start off by saying that I understand there are some differences simply due to the fact that some changes were pushed on some machines and pulled on others. Machine 1 and 2 are the primary ones I use, and it clearly doesn't differ too much. What I'm concerned about is Machine 3, which currently has 3 heads, and an additional changeset (89 instead of 88). I'm a bit confused as to what is happening, how I can fix this, and I would appreciate knowing exactly what I did to cause this so that I may avoid this type of behavior next time. Thanks in advance!

原文：https://stackoverflow.com/questions/20961651
更新时间：2023-08-29 06:08

最满意答案

 有比SteveL发布的更有效的方法。 
 

 与其计算每个点的trig函数（一种计算量大的方法），您可以根据当前点，切线向量和余弦向量找到圆上的下一个点。 trig函数计算一次，然后每个后续点是一系列乘法，速度要快得多。 
 

 该页面为OpenGL提供了一个非常清晰的步骤，但您可以轻松应用Steve的答案，使其在OpenGL ES中可用： 
 

 http://slabode.exofire.net/circle_draw.shtml 

There is a more efficient way than that posted by SteveL.
 

Rather than calculate the trig functions for each point (a computationally expensive method), you can find the next point on the circle based on the current point, the tangent vector, and the cosine vector. The trig functions are calculated once, then each subsequent point is a series of multiplications, which are much faster.
 

This page provides a very clear step-through of the process for OpenGL, but you can easily apply Steve's answer to make it work in OpenGL ES:
 

http://slabode.exofire.net/circle_draw.shtml

相关问答

更多

  • 下列中不属于面向对象的编程语言的是?[2022-05-30]

    a

  • 使用OpenGL在Android中绘制半透明纹理(Drawing translucent textures in Android using OpenGL)[2023-02-12]

    只是为了结束这个问题，以防有人绊倒它： 发生此错误是因为图像保存在res / drawable中。 当从那里加载时，Android可以进行一些幕后处理，导致产生的图像不能被设置为2的幂。 将图像存储在res / raw中以避免此处理。 Just to close the question in case anyone stumbles upon it: This error was occurring because the images were saved in res/drawable. When l ...

  • 是否可以在Android上使用OpenGL绘制全屏单帧动画？(Is drawing a fullscreen single frame animation using OpenGL feasible on Android?)[2022-07-27]

    OpenGL性能还取决于您将使用的设备。 但是在15fps下只显示30个纹理在大多数设备上都不会成为问题。 看一下这篇文章 ，从Android上的OpenGL开始。 实现循环动画非常简单。 祝你好运！ OpenGL performance will also depends on the devices you will use. But display only 30 textures at 15fps won't be a problem on most devices. Take a look at ...

  • 在OpenGL ES 1.1中绘制一个扇形切割的圆圈(Drawing a circle with a sector cut out in OpenGL ES 1.1)[2023-04-20]

    void gltDrawArc(unsigned int const segments, float angle_start, float angle_stop) { int i; float const angle_step = (angle_stop - angle_start)/segments; GLfloat *arc_vertices; arc_vertices = malloc(2*sizeof(GLfloat) * (segments+2)); a ...

  • 如何在iPhone上使用OpenGL ES绘制实心圆？(How do I draw a filled circle with OpenGL ES on iPhone?)[2021-12-29]

    对于一个真正平滑的圆，你会想要一个自定义片段着色器。 例如，以下顶点着色器： attribute vec4 position; attribute vec4 inputTextureCoordinate; varying vec2 textureCoordinate; void main() { gl_Position = position; textureCoordinate = inputTextureCoordinate.xy; } 和片段着色器： varying ...

  • 使用openGL在android中绘制一个圆(drawing a circle in android with openGL)[2022-05-01]

    有比SteveL发布的更有效的方法。 与其计算每个点的trig函数（一种计算量大的方法），您可以根据当前点，切线向量和余弦向量找到圆上的下一个点。 trig函数计算一次，然后每个后续点是一系列乘法，速度要快得多。 该页面为OpenGL提供了一个非常清晰的步骤，但您可以轻松应用Steve的答案，使其在OpenGL ES中可用： http://slabode.exofire.net/circle_draw.shtml There is a more efficient way than that posted ...

  • Android OpenGL Circle Texture倍增(Android OpenGL Circle Texture Doubled)[2022-02-25]

    所以找到解决方案（：1非常非常重要的事情，我错过了/或openGL错过了。 纹理坐标只能在0到1的范围内。 所以这是技巧/解决方案： //Build vertices : vertices[i] = (float) (((float) raduis*Math.cos(theta)))+raduis; vertices[i + 1] = (float) ((float) raduis*Math.sin(theta))+raduis; // Build texture : for (int i = 0; i ...

  • 如何使用VBO使用OpenGL（特别是LWJGL）绘制一个圆(How to draw a circle with OpenGL(LWJGL specifically) using VBOs)[2022-04-17]

    你似乎有很多这种混乱。 LWJGL和openGL实际上与此无关，无论你使用glDrawArrays还是glBegin都没关系。 在LWJGL中没有任何drawCircle函数，你必须使用三角形绘制你的圆，如果你想更高效，三角扇就更好了。 这是我编写的一个方法，它为您提供了填充弧的顶点（对于startingAngleDeg指定0和360，为整圆指定endAngleDeg ）。 public static float[] getFilledArcVertexes(float x, float y, float ...

  • Android opengl绘图文字(Android opengl drawing text)[2023-10-02]

    假设您只想让2D字母出现在3D空间中的某个点上，那么执行此操作的常规方法就是您描述的那个。 实际上，我会为整个字符串创建一个位图，然后将位图绘制到场景中。 这不是非常低效 - 实际上它非常有效，因为你可以缓存文本的位图，只需要计算一次而不是每次绘制场景。 对于简单的事情来说，似乎有很多代码，但OpenGL通常就是这样。 Assuming that you want just the 2D letters to appear at a certain point in 3D space, the normal ...

  • 在Android上的OpenGL中绘制视频帧(Drawing Video Frames in OpenGL on Android)[2022-04-29]

    仅仅因为纹理必须是2的幂，并不意味着你的数据必须是2的幂。 您可以在使用glTexImage初始化期间自由创建1024x1024（或1024x512）纹理，使用glTexImage填充较低的640x480位图数据，然后使用一些智能texcoords (0,0) to (640/1024, 480/1024)显示较低的640x480纹理(0,0) to (640/1024, 480/1024) 。 纹理的其余部分将包含从未见过的空白空间。 Just because a texture has to be a ...

相关文章

更多
  • Commons log记录Log日志
  • Log4j 记录Log日志
  • 问个log4j的应用一个问题。
  • 请教：log4j 问题
  • Solr 使用 Log4j
  • Log4j 随笔
  • LOG4J的配置
  • The Log: What every software engineer should know about real-time data's unifying abstraction
  • Solr 使用 Log4j
  • solr之去除log

    • 最新问答

    更多
  • 获取MVC 4使用的DisplayMode后缀(Get the DisplayMode Suffix being used by MVC 4)
  • 如何通过引用返回对象？(How is returning an object by reference possible?)
  • 矩阵如何存储在内存中？(How are matrices stored in memory?)
  • 每个请求的Java新会话？(Java New Session For Each Request?)
  • css：浮动div中重叠的标题h1(css: overlapping headlines h1 in floated divs)
  • 无论图像如何，Caffe预测同一类(Caffe predicts same class regardless of image)
  • xcode语法颜色编码解释？(xcode syntax color coding explained?)
  • 在Access 2010 Runtime中使用Office 2000校对工具(Use Office 2000 proofing tools in Access 2010 Runtime)
  • 从单独的Web主机将图像传输到服务器上(Getting images onto server from separate web host)
  • 从旧版本复制文件并保留它们（旧/新版本）(Copy a file from old revision and keep both of them (old / new revision))
  • 西安哪有PLC可控制编程的培训
  • 在Entity Framework中选择基类(Select base class in Entity Framework)
  • 在Android中出现错误“数据集和渲染器应该不为null，并且应该具有相同数量的系列”(Error “Dataset and renderer should be not null and should have the same number of series” in Android)
  • 电脑二级VF有什么用
  • Datamapper Ruby如何添加Hook方法(Datamapper Ruby How to add Hook Method)
  • 金华英语角.
  • 手机软件如何制作
  • 用于Android webview中图像保存的上下文菜单(Context Menu for Image Saving in an Android webview)
  • 注意：未定义的偏移量：PHP(Notice: Undefined offset: PHP)
  • 如何读R中的大数据集[复制](How to read large dataset in R [duplicate])
  • Unity 5 Heighmap与地形宽度/地形长度的分辨率关系？(Unity 5 Heighmap Resolution relationship to terrain width / terrain length?)
  • 如何通知PipedOutputStream线程写入最后一个字节的PipedInputStream线程？(How to notify PipedInputStream thread that PipedOutputStream thread has written last byte?)
  • python的访问器方法有哪些
  • DeviceNetworkInformation：哪个是哪个？(DeviceNetworkInformation: Which is which?)
  • 在Ruby中对组合进行排序(Sorting a combination in Ruby)
  • 网站开发的流程？
  • 使用Zend Framework 2中的JOIN sql检索数据(Retrieve data using JOIN sql in Zend Framework 2)
  • 条带格式类型格式模式编号无法正常工作(Stripes format type format pattern number not working properly)
  • 透明度错误IE11(Transparency bug IE11)
  • linux的基本操作命令。。。

    • Copyright ©2023 peixunduo.com All Rights Reserved.粤ICP备14003112号

    本站部分内容来源于互联网，仅供学习和参考使用，请莫用于商业用途。如有侵犯你的版权，请联系我们(neng862121861#163.com)，本站将尽快处理。谢谢合作！