Advertisement
Guest User

hg clone from non bare repository

a guest
Aug 15th, 2013
106
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.23 KB | None | 0 0
  1. <pre>
  2.  
  3. henry@torak:/tmp$ hg init a
  4.  
  5. henry@torak:/tmp$ hg clone a intermediate
  6. updating to branch default
  7. 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  8.  
  9. henry@torak:/tmp$ hg clone intermediate b
  10. updating to branch default
  11. 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  12.  
  13. henry@torak:/tmp$ hg clone intermediate c
  14. updating to branch default
  15. 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  16.  
  17. henry@torak:/tmp$ cd c
  18.  
  19. henry@torak:/tmp/c$ date > date1.txt ; hg add date1.txt
  20.  
  21. henry@torak:/tmp/c$ hg commit -m "c commit" ; bit push
  22. pushing to /tmp/intermediate
  23. searching for changes
  24. adding changesets
  25. adding manifests
  26. adding file changes
  27. added 1 changesets with 1 changes to 1 files
  28.  
  29. henry@torak:/tmp/c$ hg commit -m "c commit" ; hg push
  30. nothing changed
  31. pushing to /tmp/intermediate
  32. searching for changes
  33. no changes found
  34.  
  35. henry@torak:/tmp/c$ cd ../b
  36.  
  37. henry@torak:/tmp/b$ hg pull
  38. pulling from /tmp/intermediate
  39. requesting all changes
  40. adding changesets
  41. adding manifests
  42. adding file changes
  43. added 1 changesets with 1 changes to 1 files
  44. (run 'hg update' to get a working copy)
  45.  
  46. henry@torak:/tmp/b$ hg update
  47. 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  48.  
  49. henry@torak:/tmp/b$ ls
  50. date1.txt
  51. henry@torak:/tmp/b$ cd ../intermediate
  52.  
  53. henry@torak:/tmp/intermediate$ ls
  54.  
  55. henry@torak:/tmp/intermediate$ hg update
  56. 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  57.  
  58. henry@torak:/tmp/intermediate$ cd ../b
  59.  
  60. henry@torak:/tmp/b$ ls
  61. date1.txt
  62.  
  63. henry@torak:/tmp/b$ date > datefromb.txt; hg add datefromb.txt ; hg commit -m "commit from b" ; hg push
  64. pushing to /tmp/intermediate
  65. searching for changes
  66. adding changesets
  67. adding manifests
  68. adding file changes
  69. added 1 changesets with 1 changes to 1 files
  70. pushing to /tmp/intermediate
  71. searching for changes
  72. no changes found
  73.  
  74. henry@torak:/tmp/b$ cd ../c ; ls
  75. date1.txt
  76.  
  77. henry@torak:/tmp/c$ date > datefromc.txt ; hg add datefromc.txt ; hg push
  78. pushing to /tmp/intermediate
  79. searching for changes
  80. no changes found
  81.  
  82. henry@torak:/tmp/c$ cd ../b; hg pull ; hg update
  83. pulling from /tmp/intermediate
  84. searching for changes
  85. no changes found
  86. 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  87.  
  88. henry@torak:/tmp/b$ ls
  89. date1.txt datefromb.txt
  90.  
  91. henry@torak:/tmp/c$ cd ../c; date > datefromc.txt ; hg add datefromc.txt; hg commit -m "push from c" ; hg push
  92. pushing to /tmp/intermediate
  93. searching for changes
  94. abort: push creates new remote head ba30fcc90ab6!
  95. (you should pull and merge or use push -f to force)
  96. warning: commit.autopush hook exited with status 255
  97. pushing to /tmp/intermediate
  98. searching for changes
  99. abort: push creates new remote head ba30fcc90ab6!
  100. (you should pull and merge or use push -f to force)
  101.  
  102. henry@torak:/tmp/c$ hg pull ; hg update
  103. pulling from /tmp/intermediate
  104. searching for changes
  105. adding changesets
  106. adding manifests
  107. adding file changes
  108. added 1 changesets with 1 changes to 1 files (+1 heads)
  109. (run 'hg heads' to see heads, 'hg merge' to merge)
  110. abort: crosses branches (merge branches or update --check to force update)
  111.  
  112. henry@torak:/tmp/c$ hg pull --rebase
  113. pulling from /tmp/intermediate
  114. searching for changes
  115. no changes found
  116.  
  117. henry@torak:/tmp/c$ hg update
  118. abort: crosses branches (merge branches or update --check to force update)
  119.  
  120. henry@torak:/tmp/c$ hg merge
  121. 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  122. (branch merge, don't forget to commit)
  123.  
  124. henry@torak:/tmp/c$ hg commit -m "hg merge"
  125. pushing to /tmp/intermediate
  126. searching for changes
  127. adding changesets
  128. adding manifests
  129. adding file changes
  130. added 2 changesets with 1 changes to 1 files
  131.  
  132. henry@torak:/tmp/c$ hg push
  133. pushing to /tmp/intermediate
  134. searching for changes
  135. no changes found
  136. henry@torak:/tmp/c$ ls
  137. date1.txt datefromb.txt datefromc.txt
  138. henry@torak:/tmp/c$ cd ..
  139. henry@torak:/tmp$ cd b
  140. henry@torak:/tmp/b$ ls
  141. date1.txt datefromb.txt
  142.  
  143. henry@torak:/tmp/b$ hg pull ; hg merge ; hg update ; hg push
  144. pulling from /tmp/intermediate
  145. searching for changes
  146. adding changesets
  147. adding manifests
  148. adding file changes
  149. added 2 changesets with 1 changes to 1 files
  150. (run 'hg update' to get a working copy)
  151. abort: nothing to merge
  152. (use 'hg update' instead)
  153. 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  154. pushing to /tmp/intermediate
  155. searching for changes
  156. no changes found
  157.  
  158. henry@torak:/tmp/intermediate$ cd ../intermediate hg push
  159. pushing to /tmp/a
  160. searching for changes
  161. adding changesets
  162. adding manifests
  163. adding file changes
  164. added 4 changesets with 3 changes to 3 files
  165.  
  166. henry@torak:/tmp/intermediate$ hg update
  167. 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  168. henry@torak:/tmp/intermediate$ ls
  169. date1.txt datefromb.txt datefromc.txt
  170.  
  171. henry@torak:/tmp/intermediate$ hg push
  172. pushing to /tmp/a
  173. searching for changes
  174. no changes found
  175. henry@torak:/tmp/intermediate$ cd ../a ; ls
  176.  
  177. henry@torak:/tmp/a$ hg update ; ls
  178. 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
  179. date1.txt datefromb.txt datefromc.txt
  180.  
  181. </pre>
  182.  
  183. my .hgrc
  184.  
  185. <pre>
  186.  
  187. [extensions]
  188. hgext.convert=
  189. rebase=
  190.  
  191. [ui]
  192. username = Henry Crutcher <henry@equitieslab.com>
  193.  
  194.  
  195. [hooks]
  196. commit.autopush = hg push
  197.  
  198. </pre>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement