Mercurial > hg
annotate tests/test-revert-flags.t @ 34192:da2f5f19312c
uncommit: move fb-extension to core which uncommits a changeset
uncommit extension in fb-hgext adds a uncommit command which by default
uncommits a changeset and move all the changes to the working directory. If
file names are passed, uncommit moves the changes from those files to the
working directory and left the changeset with remaining committed files.
The uncommit extension in fb-hgext does not creates an empty commit like the one
in evolve extension unless user has specified ui.alllowemptycommit to True.
The test file added is a combination of tests from test-uncommit.t,
test-uncommit-merge.t and test-uncommit-bookmark.t from fb-hgext.
.. feature::
A new uncommit extension which provides `hg uncommit` using which one can
uncommit part or all of the changeset. This command undoes the effect of a
local commit, returning the affected files to their uncommitted state.
Differential Revision: https://phab.mercurial-scm.org/D529
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 24 Aug 2017 22:55:56 +0530 |
parents | 7a9cbb315d84 |
children |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
16913
diff
changeset
|
1 #require execbit |
6030
d0dbae32517c
revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 |
12110
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
3 $ hg init repo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
4 $ cd repo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
5 $ echo foo > foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
6 $ chmod 644 foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
7 $ hg ci -qAm '644' |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
8 |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
9 $ chmod 755 foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
10 $ hg ci -qAm '755' |
6030
d0dbae32517c
revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
11 |
12110
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
12 reverting to rev 0 |
6030
d0dbae32517c
revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
13 |
12110
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
14 $ hg revert -a -r 0 |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
15 reverting foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
16 $ hg st |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
17 M foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
18 $ hg diff --git |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
19 diff --git a/foo b/foo |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
20 old mode 100755 |
58a8105242a5
tests: unify test-revert-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6030
diff
changeset
|
21 new mode 100644 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12110
diff
changeset
|
22 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12110
diff
changeset
|
23 $ cd .. |