Loading

Paste #p2khxukvv

  1. ingo@aeolus:~/tmp$ cd test
  2. ingo@aeolus:~/tmp/test$ # Pastebin Y3H27Eql
  3. ingo@aeolus:~/tmp/test$ hg init mq-test
  4. ingo@aeolus:~/tmp/test$ hg init --mq mq-test
  5. ingo@aeolus:~/tmp/test$ cd mq-test
  6. ingo@aeolus:~/tmp/test/mq-test$ echo foo1 > foo1
  7. ingo@aeolus:~/tmp/test/mq-test$ hg add foo1
  8. ingo@aeolus:~/tmp/test/mq-test$ hg qnew test
  9. ingo@aeolus:~/tmp/test/mq-test$ hg ci --mq -m "add foo1"
  10. ingo@aeolus:~/tmp/test/mq-test$ echo foo2 > foo2
  11. ingo@aeolus:~/tmp/test/mq-test$ hg add foo2
  12. ingo@aeolus:~/tmp/test/mq-test$ hg qref
  13. ingo@aeolus:~/tmp/test/mq-test$ hg ci --mq -m "add foo2"
  14. ingo@aeolus:~/tmp/test/mq-test$ hg rm foo1
  15. ingo@aeolus:~/tmp/test/mq-test$ hg mv foo2 foo1
  16. ingo@aeolus:~/tmp/test/mq-test$ hg forget foo2
  17. ingo@aeolus:~/tmp/test/mq-test$ hg revert foo2
  18. ingo@aeolus:~/tmp/test/mq-test$ hg revert foo1
  19. ingo@aeolus:~/tmp/test/mq-test$ hg glog -l5
  20. @  0:a2d42532e525 qbase qtip test tip 2014-11-18 19:30 +0100 (planetmaker)
  21.     [mq]: test
  22.  
  23. ingo@aeolus:~/tmp/test/mq-test$ ls .hg/patches/
  24. series  status  test
  25. ingo@aeolus:~/tmp/test/mq-test$ cat .hg/patches/series
  26. test
  27. ingo@aeolus:~/tmp/test/mq-test$ cat .hg/patches/series/te^C
  28. ingo@aeolus:~/tmp/test/mq-test$ hg export tip
  29. # HG changeset patch
  30. # User planetmaker <planetmaker@openttd.org>
  31. # Date 1416335402 -3600
  32. #      Tue Nov 18 19:30:02 2014 +0100
  33. # Node ID a2d42532e525234b425a590f6ae1347b78927b4f
  34. # Parent  0000000000000000000000000000000000000000
  35. [mq]: test
  36.  
  37. diff --git a/foo1 b/foo1
  38. new file mode 100644
  39. --- /dev/null
  40. +++ b/foo1
  41. @@ -0,0 +1,1 @@
  42. +foo1
  43. diff --git a/foo2 b/foo2
  44. new file mode 100644
  45. --- /dev/null
  46. +++ b/foo2
  47. @@ -0,0 +1,1 @@
  48. +foo2
  49. ingo@aeolus:~/tmp/test/mq-test$ cat .hg/patches/test
  50. # HG changeset patch
  51. # Parent  0000000000000000000000000000000000000000
  52.  
  53. diff --git a/foo1 b/foo1
  54. new file mode 100644
  55. --- /dev/null
  56. +++ b/foo1
  57. @@ -0,0 +1,1 @@
  58. +foo1
  59. diff --git a/foo2 b/foo2
  60. new file mode 100644
  61. --- /dev/null
  62. +++ b/foo2
  63. @@ -0,0 +1,1 @@
  64. +foo2
  65. ingo@aeolus:~/tmp/test/mq-test$ hg export -r. > tmp.diff
  66. ingo@aeolus:~/tmp/test/mq-test$ diff tmp.diff .hg/patches/test
  67. 2,5d1
  68. < # User planetmaker <planetmaker@openttd.org>
  69. < # Date 1416335402 -3600
  70. < #      Tue Nov 18 19:30:02 2014 +0100
  71. < # Node ID a2d42532e525234b425a590f6ae1347b78927b4f
  72. 7d2
  73. < [mq]: test

Comments