git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Mercurial vs Updated git HOWTO for kernel hackers

From
Petr Baudis <pasky@ucw.cz>
Date
Jun 28, 2005, 15:00 UTC
Message-ID
<20050628150027.GB1275@pasky.ji.cz>
In-Reply-To
<20050624123819.GD9519@64m.dyndns.org>

Dear diary, on Fri, Jun 24, 2005 at 02:38:19PM CEST, I got a letter where Christopher Li <hg@chrisli.org> told me that...

Show 17 quoted lines
> On Fri, Jun 24, 2005 at 08:41:01AM +0200, Petr Baudis wrote:
> > > 5.1) undo the last commit or pull
> > > 
> > > $ hg undo
> > 
> > $ cg-admin-uncommit
> > 
> > Note that you should never do this if you already pushed the changes
> > out, or someone might get them. (That holds for regular Git too.) See
> > 
> > $ cg-help cg-admin-uncommit   # (or cg-admin-uncommit --help)
> > 
> > for details. (That's another Cogito's cool feature. Handy docs! ;-)
> > 
> 
> Does it still works if the last commit was interrupted  or due to error for some
> reason?

If the last commit was interrupted, it didn't happen, so your tree stays in the same state as before doing the commit, as well as the repository. You can just try again. If you want to get rid of dirty stuff, cg-cancel.

> Undo pull is pretty cool because you might pull a lot of commit
> in one blow. Get rid of commit one by one is going to be painful. Some times
> the object you pull has more than one chain of history it will be very nasty
> if you want to clean it up.

If it was a tree merge, cg-admin-uncommit will undo it. If it was fast-forward merge, there is no direct way to uncommit it, but you can find the first fast-forwarded commit and pass it as argument to cg-admin-uncommit; it will then rewind all the commits up to (including) the given commit.

> Mercurial's undo is taking a snapshot of all the changed file's repo file length
> at every commit or pull.  It just truncate the file to original size and undo 
> is done.

"Trunactes"? That sounds very wrong... you mean replace with old version? Anyway, what if the file has same length? It just doesn't make much sense to me.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
<Espy> be careful, some twit might quote you out of context..
Previous: Christopher LiNext: Andrew Thompson
Message 48 of 94 in “Updated git HOWTO for kernel hackers”
  1. Jeff GarzikJun 22, 2005
  2. Dave JonesJun 22, 2005
  3. Jeff GarzikJun 22, 2005
  4. Dave JonesJun 22, 2005
  5. Jeff GarzikJun 23, 2005
  6. Jeff GarzikJun 25, 2005
  7. Dave JonesJun 25, 2005
  8. Greg KHJun 22, 2005
  9. Linus TorvaldsJun 22, 2005
  10. Jeff GarzikJun 23, 2005
  11. Linus TorvaldsJun 23, 2005
  12. Jeff GarzikJun 23, 2005
  13. Linus TorvaldsJun 23, 2005
  14. Jeff GarzikJun 23, 2005
  15. Linus TorvaldsJun 23, 2005
  16. Jeff GarzikJun 23, 2005
  17. Linus TorvaldsJun 23, 2005
  18. Jeff GarzikJun 23, 2005
  19. Linus TorvaldsJun 23, 2005
  20. Greg KHJun 23, 2005
  21. Linus TorvaldsJun 23, 2005
  22. Greg KHJun 23, 2005
  23. Jeff GarzikJun 23, 2005
  24. Petr BaudisJun 23, 2005
  25. Martin LanghoffJun 23, 2005
  26. Vojtech PavlikJun 23, 2005
  27. Linus TorvaldsJun 22, 2005
  28. Jeff GarzikJun 23, 2005
  29. Linus TorvaldsJun 23, 2005
  30. Jeff GarzikJun 23, 2005
  31. Linus TorvaldsJun 23, 2005
  32. Linus TorvaldsJun 23, 2005
  33. Jeff GarzikJun 23, 2005
  34. Linus TorvaldsJun 23, 2005
  35. Adam KropelinJun 23, 2005
  36. Linus TorvaldsJun 23, 2005
  37. Jeff GarzikJun 23, 2005
  38. Linus TorvaldsJun 23, 2005
  39. Miles BaderJun 23, 2005
  40. Jeff GarzikJun 23, 2005
  41. Linus TorvaldsJun 23, 2005
  42. Anton AltaparmakovJun 23, 2005
  43. Daniel BarkalowJun 23, 2005
  44. Dave AirlieJun 23, 2005
  45. Mercurial vs Updated git HOWTO for kernel hackersMatt Mackall, Jun 23, 2005
  46. Petr BaudisJun 24, 2005
  47. Christopher LiJun 24, 2005
  48. Petr BaudisJun 28, 2005
  49. Andrew ThompsonJun 28, 2005
  50. Petr BaudisJun 28, 2005
  51. Matt MackallJun 28, 2005
  52. Kyle MoffettJun 28, 2005
  53. SeanJun 28, 2005
  54. Matt MackallJun 28, 2005
  55. SeanJun 28, 2005
  56. Kyle MoffettJun 28, 2005
  57. Matt MackallJun 28, 2005
  58. SeanJun 28, 2005
  59. Kyle MoffettJun 28, 2005
  60. SeanJun 28, 2005
  61. Kyle MoffettJun 29, 2005
  62. SeanJun 29, 2005
  63. Kyle MoffettJun 29, 2005
  64. Vojtech PavlikJun 29, 2005
  65. Matt MackallJun 28, 2005
  66. Thomas Arendsen HeinJun 29, 2005
  67. Andrea ArcangeliJun 24, 2005
  68. Theodore Ts'oJun 24, 2005
  69. Paolo CiarrocchiJun 24, 2005
  70. Christopher LiJun 24, 2005
  71. Kevin SmithJun 24, 2005
  72. Matt MackallJun 24, 2005
  73. Petr BaudisJun 28, 2005
  74. Sven VerdoolaegeJun 28, 2005
  75. Petr BaudisJun 28, 2005
  76. Cygwin and Native MS Windows (was: Mercurial vs Updated git HOWTO for kernel hackers)Kevin Smith, Jun 28, 2005
  77. Cogito vs. Git (was: Mercurial vs Updated git HOWTO for kernel hackers)Kevin Smith, Jun 28, 2005
  78. Petr BaudisJun 28, 2005
  79. Matthias UrlichsJun 24, 2005
  80. Linus TorvaldsJun 24, 2005
  81. John W. LinvilleJun 24, 2005
  82. Jeff GarzikJun 24, 2005
  83. Daniel BarkalowJun 24, 2005
  84. Should "git-read-tree -m -u" delete files?Junio C Hamano, Jun 24, 2005
  85. Joel BeckerJun 24, 2005
  86. Kyle MoffettJun 24, 2005
  87. Pavel MachekJun 27, 2005
  88. Kyle MoffettJun 27, 2005
  89. Matt MackallJun 27, 2005
  90. Benjamin LaHaiseJun 27, 2005
  91. Matt MackallJun 27, 2005
  92. Ed TomlinsonJun 27, 2005
  93. Amin AzezJul 8, 2005
  94. Amin AzezJul 11, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.