Commit Graph

8 Commits (f87f0ec277118b3bf906e7a5109cacb54641ea57)

Author SHA1 Message Date
Michael Scherer 514da9550b Use the proper type for 'dest' argument 8 years ago
Jordi Gutiérrez Hermoso c038e7013a hg: discard changes without changing the current revision
The command `hg up -C` by default moves to the latest revision on the
current branch. The `discard` function was trying to update to a
different branch, in case it was provided, by passing a `-r REVISION`
argument. Not only is this not the intended effect of the `discard`
function, but this also could update to a different branch that hasn't
been pulled yet, which is how we were experiencing trouble.

Instead, we unconditionally do `hg up -C -r .` to "update" to the
current revision (i.e. to "."), while `-C/--clean`ing the current
directory. This is similar to `hg revert --all`, except that it also
undoes the merge state of the working directory, in case there was
any.
9 years ago
Brian Coca 42ccb25182 Merge pull request #1149 from catlee/hg_update
Add support for 'update' parameter to hg module
9 years ago
Greg DeKoenigsberg 2a5f0bde87 Proper author info for all remaining modules 9 years ago
Chris AtLee 85cff6699e Add support for 'update' parameter to hg module 10 years ago
Toshio Kuratomi be744ce5e7 Reverse the force parameter for the hg module 10 years ago
Nate Coraor 204a0dc131 Fix a few bugs and misbehavior in the hg module:
1. Don't pull when `dest` is already at the desired changeset.
2. Don't change the working copy when cleaning or pulling and a revision
   was specified.
3. Change the default for the `revision` param to match the behavior of
   hg.
10 years ago
Michael DeHaan c8e1a2077e file extensions! 10 years ago