Mercurial > hg
annotate tests/test-rebase-brute-force.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 | 19f495fef0a3 |
children | 1644623ab096 |
rev | line source |
---|---|
33708 | 1 $ cat >> $HGRCPATH <<EOF |
2 > [extensions] | |
3 > drawdag=$TESTDIR/drawdag.py | |
4 > bruterebase=$TESTDIR/bruterebase.py | |
5 > [experimental] | |
6 > evolution=createmarkers,allowunstable | |
7 > EOF | |
8 $ init() { | |
9 > N=`expr ${N:-0} + 1` | |
10 > cd $TESTTMP && hg init repo$N && cd repo$N | |
11 > hg debugdrawdag | |
12 > } | |
13 | |
14 Source looks like "N" | |
15 | |
16 $ init <<'EOS' | |
17 > C D | |
18 > |\| | |
19 > A B Z | |
20 > EOS | |
21 | |
22 $ hg debugbruterebase 'all()-Z' Z | |
23 A: A':Z | |
24 B: B':Z | |
25 AB: A':Z B':Z | |
33789
19f495fef0a3
rebase: change "result would have 3 parent" error message (BC)
Jun Wu <quark@fb.com>
parents:
33786
diff
changeset
|
26 C: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents |
33708 | 27 AC: A':Z C':A'B |
28 BC: B':Z C':B'A | |
29 ABC: A':Z B':Z C':A'B' | |
30 D: D':Z | |
31 AD: A':Z D':Z | |
32 BD: B':Z D':B' | |
33 ABD: A':Z B':Z D':B' | |
33789
19f495fef0a3
rebase: change "result would have 3 parent" error message (BC)
Jun Wu <quark@fb.com>
parents:
33786
diff
changeset
|
34 CD: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents |
33786
0975506120fb
rebase: rewrite core algorithm (issue5578) (issue5630)
Jun Wu <quark@fb.com>
parents:
33708
diff
changeset
|
35 ACD: A':Z C':A'B D':Z |
33708 | 36 BCD: B':Z C':B'A D':B' |
37 ABCD: A':Z B':Z C':A'B' D':B' | |
38 | |
39 Moving backwards | |
40 | |
41 $ init <<'EOS' | |
42 > C | |
43 > |\ | |
44 > A B | |
45 > | | |
46 > Z | |
47 > EOS | |
48 $ hg debugbruterebase 'all()-Z' Z | |
49 B: B':Z | |
50 A: | |
51 BA: B':Z | |
33789
19f495fef0a3
rebase: change "result would have 3 parent" error message (BC)
Jun Wu <quark@fb.com>
parents:
33786
diff
changeset
|
52 C: ABORT: cannot rebase 3:b8d7149b562b without moving at least one of its parents |
33708 | 53 BC: B':Z C':B'A |
54 AC: | |
33786
0975506120fb
rebase: rewrite core algorithm (issue5578) (issue5630)
Jun Wu <quark@fb.com>
parents:
33708
diff
changeset
|
55 BAC: B':Z C':B'A |