Mercurial > hg
annotate tests/test-revlog-packentry.t @ 16458:55982f62651f
commit: add option to amend the working dir parent
The --amend flag can be used to amend the parent of the working directory
with a new commit that contains the changes in the parent in addition to
those currently reported by "hg status", if there are any. The old commit
is stored in a backup bundle in ".hg/strip-backup"(see "hg help bundle"
and "hg help unbundle" on how to restore it).
Message, user and date are taken from the amended commit unless specified.
When a message isn't specified on the command line, the editor will open
with the message of the amended commit.
It is not possible to amend public changesets (see "hg help phases") or
changesets that have children.
Behind the scenes, first commit the update (if there is one) as a regular
child of the current parent. Then create a new commit on the parent's
parent with the updated contents. Then change the working copy parent
to this new combined changeset. Finally, strip the amended commit and
update commit created in the beginning.
An alternative (cleaner?) approach of doing this is suggested here:
http://selenic.com/pipermail/mercurial-devel/2012-March/038540.html
It is currently not possible to amend merge commits or recursively,
this can be added at a later time.
author | Idan Kamara <idankk86@gmail.com> |
---|---|
date | Wed, 18 Apr 2012 01:20:16 +0300 |
parents | ec5886db9dc6 |
children | f2719b387380 |
rev | line source |
---|---|
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
1 $ hg init repo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
2 $ cd repo |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
3 |
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
4 $ touch foo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
5 $ hg ci -Am 'add foo' |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
6 adding foo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
7 |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
8 $ hg up -C null |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
9 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
10 |
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
11 this should be stored as a delta against rev 0 |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
12 |
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
13 $ echo foo bar baz > foo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
14 $ hg ci -Am 'add foo again' |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
15 adding foo |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
16 created new head |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
17 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
11919
diff
changeset
|
18 $ hg debugindex foo |
11919
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
19 rev offset length base linkrev nodeid p1 p2 |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
20 0 0 0 0 0 b80de5d13875 000000000000 000000000000 |
67fb33eb3add
tests: unify test-revlog-packentry
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
5338
diff
changeset
|
21 1 0 24 0 1 0376abec49b8 000000000000 000000000000 |