Don't like ads? PRO users don't see any ads ;-)
Public Pastes
Guest

Untitled

By: a guest on May 7th, 2012  |  syntax: None  |  size: 2.55 KB  |  hits: 13  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. mercurial to sync to flashdrive and multiple machines
  2. $hg addremove
  3. $hg commit -m "added stuff"
  4. $ hg push /media/USBNAME/docs
  5. pushing to /media/USBNAME/docs
  6. searching for changes
  7. abort: push creates new remote head bb0e20a00aa3!
  8. (you should pull and merge or use push -f to force)
  9.        
  10. $ cd /home/docs
  11. $ hg status
  12. $ hg addremove
  13. $ hg commit -m "yet another test"
  14. $ hg push /media/USBNAME/docs
  15.   pushing to /media/USBNAME/docs
  16.   searching for changes
  17.   abort: push creates new remote head 119134ce5d5d!
  18.   (you should pull and merge or use push -f to force)
  19. $ hg pull /media/USBNAME/docs
  20.   pulling from /media/USBNAME/docs
  21.   searching for changes
  22.   adding changesets
  23.   adding manifests
  24.   adding file changes
  25.   added 2 changesets with 0 changes to 0 files (+1 heads)
  26.   (run 'hg heads' to see heads, 'hg merge' to merge)
  27. $ hg merge
  28. 0 files updated, 0 files merged, 5 files removed, 0 files unresolved
  29. (branch merge, don't forget to commit)
  30.        
  31. $ cd ~/dir-dest
  32. $ hg pull ~/dir-source
  33.   pulling from ~/dir-source
  34.   searching for changes
  35.   adding changesets
  36.   adding manifests
  37.   adding file changes
  38.   added 1 changesets with 1 changes to 1 files
  39.   (run 'hg update' to get a working copy)
  40. $ hg update
  41.        
  42. $ cd ~/dir-source
  43. $ hg push ~/dir-dest
  44.   pushing to ~/dir-dest
  45.   searching for changes
  46.   adding changesets
  47.   adding manifests
  48.   adding file changes
  49.   added 1 changesets with 1 changes to 1 files
  50. $ cd ~/dir-dest
  51. $ hg update
  52.        
  53. remote: [a] --- [b] --- [c]
  54.        
  55. local:  [a] --- [b] --- [c] --- [x] --- [y]
  56.        
  57. remote: [a] --- [b] --- [c] --- [d]
  58.        
  59. $ hg push
  60. pushing to /home/mg/tmp/remote
  61. searching for changes
  62. abort: push creates new remote head a2f1cea74307!
  63. (you should pull and merge or use push -f to force)
  64.        
  65. remote: [a] --- [b] --- [c] --- [d]
  66.                            
  67.                             [x] --- [y]
  68.        
  69. $ hg pull
  70. pulling from /home/mg/tmp/remote
  71. searching for changes
  72. adding changesets
  73. adding manifests
  74. adding file changes
  75. added 1 changesets with 1 changes to 1 files (+1 heads)
  76. (run 'hg heads' to see heads, 'hg merge' to merge)
  77.        
  78. local:  [a] --- [b] --- [c] --- [x] --- [y]
  79.                            
  80.                             [d]
  81.        
  82. local:  [a] --- [b] --- [c] --- [x] --- [y] --- [z]
  83.                                               /
  84.                             [d] --------------'
  85.        
  86. $ hg push /media/USB/folder
  87.        
  88. [a] --- [b] --- [c]
  89.            
  90.             [x] --- [y]
  91.        
  92. [a] --- [b] --- [c] --- [d]
  93.                       /
  94.             [x] --- [y]
  95.        
  96. $ hg pull /media/USB/folder
  97. $ hg merge
  98. $ hg commit -m "Merge with latest stuff on machine X"
  99. $ hg push /media/USB/folder
create a new version of this paste RAW Paste Data